Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/MessagesReceivedEvent.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/MessagesReceivedEvent.java?rev=1525515&r1=1525514&r2=1525515&view=diff ============================================================================== --- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/MessagesReceivedEvent.java (original) +++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/MessagesReceivedEvent.java Mon Sep 23 07:04:08 2013 @@ -18,129 +18,28 @@ ****************************************************************/ package org.apache.hupa.shared.events; -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD import java.util.List; import org.apache.hupa.shared.domain.ImapFolder; import org.apache.hupa.shared.domain.Message; -======= -import java.util.ArrayList; -======= -import java.util.List; ->>>>>>> try to fetch messages, yet can not fire the login event in ModelTable such that just get a NullPointerException in it. - -<<<<<<< HEAD -import org.apache.hupa.shared.data.Message; -<<<<<<< HEAD -<<<<<<< HEAD ->>>>>>> first commit -======= -import org.apache.hupa.shared.proxy.IMAPFolderProxy; ->>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think. -======= -import java.util.ArrayList; - -import org.apache.hupa.shared.data.Message; -<<<<<<< HEAD -<<<<<<< HEAD ->>>>>>> first commit -======= -import org.apache.hupa.shared.proxy.IMAPFolderProxy; ->>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think. -======= -import org.apache.hupa.shared.proxy.ImapFolder; ->>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now. -======= -import org.apache.hupa.shared.domain.ImapFolder; ->>>>>>> Allow client can use the domain entity interface. -======= -import org.apache.hupa.shared.domain.ImapFolder; -import org.apache.hupa.shared.domain.Message; ->>>>>>> try to change fetch messages to use RF import com.google.gwt.event.shared.GwtEvent; public class MessagesReceivedEvent extends GwtEvent<MessagesReceivedEventHandler>{ public final static Type<MessagesReceivedEventHandler> TYPE = new Type<MessagesReceivedEventHandler>(); -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD private List<Message> messages; private ImapFolder folder; public MessagesReceivedEvent(ImapFolder folder, List<Message> messages) { -======= - private ArrayList<Message> messages; - private IMAPFolderProxy folder; - -<<<<<<< HEAD - public MessagesReceivedEvent(IMAPFolder folder, ArrayList<Message> messages) { ->>>>>>> first commit -======= - public MessagesReceivedEvent(IMAPFolderProxy folder, ArrayList<Message> messages) { ->>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think. -======= - private ArrayList<Message> messages; - private ImapFolder folder; - -<<<<<<< HEAD -<<<<<<< HEAD - public MessagesReceivedEvent(IMAPFolder folder, ArrayList<Message> messages) { ->>>>>>> first commit -======= - public MessagesReceivedEvent(IMAPFolderProxy folder, ArrayList<Message> messages) { ->>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think. -======= - public MessagesReceivedEvent(ImapFolder folder, ArrayList<Message> messages) { ->>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now. -======= - private List<Message> messages; - private ImapFolder folder; - - public MessagesReceivedEvent(ImapFolder folder, List<Message> messages) { ->>>>>>> try to fetch messages, yet can not fire the login event in ModelTable such that just get a NullPointerException in it. this.messages = messages; this.folder = folder; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - public List<Message> getMessages() { - return messages; - } - - public ImapFolder getFolder() { -======= -======= ->>>>>>> first commit - public ArrayList<Message> getMessages() { -======= public List<Message> getMessages() { ->>>>>>> try to fetch messages, yet can not fire the login event in ModelTable such that just get a NullPointerException in it. return messages; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - public IMAPFolder getFolder() { ->>>>>>> first commit -======= - public IMAPFolderProxy getFolder() { ->>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think. -======= - public IMAPFolder getFolder() { ->>>>>>> first commit -======= - public IMAPFolderProxy getFolder() { ->>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think. -======= public ImapFolder getFolder() { ->>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now. return folder; }
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/MoveMessageEvent.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/MoveMessageEvent.java?rev=1525515&r1=1525514&r2=1525515&view=diff ============================================================================== --- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/MoveMessageEvent.java (original) +++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/MoveMessageEvent.java Mon Sep 23 07:04:08 2013 @@ -1,81 +1,3 @@ -<<<<<<< HEAD -<<<<<<< HEAD -/**************************************************************** - * Licensed to the Apache Software Foundation (ASF) under one * - * or more contributor license agreements. See the NOTICE file * - * distributed with this work for additional information * - * regarding copyright ownership. The ASF licenses this file * - * to you under the Apache License, Version 2.0 (the * - * "License"); you may not use this file except in compliance * - * with the License. You may obtain a copy of the License at * - * * - * http://www.apache.org/licenses/LICENSE-2.0 * - * * - * Unless required by applicable law or agreed to in writing, * - * software distributed under the License is distributed on an * - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * - * KIND, either express or implied. See the License for the * - * specific language governing permissions and limitations * - * under the License. * - ****************************************************************/ - -package org.apache.hupa.shared.events; - -import org.apache.hupa.shared.domain.ImapFolder; -import org.apache.hupa.shared.domain.Message; -import org.apache.hupa.shared.domain.User; - -import com.google.gwt.event.shared.GwtEvent; - -public class MoveMessageEvent extends GwtEvent<MoveMessageEventHandler> { - - public final static Type<MoveMessageEventHandler> TYPE = new Type<MoveMessageEventHandler>(); - private User user; - private ImapFolder oldFolder; - private ImapFolder newFolder; - private Message message; - - public MoveMessageEvent(User user, ImapFolder oldFolder, - ImapFolder newFolder, Message message) { - this.user = user; - this.oldFolder = oldFolder; - this.newFolder = newFolder; - this.message = message; - } - - public MoveMessageEvent(ImapFolder newFolder) { - this.newFolder = newFolder; - } - - public User getUser() { - return user; - } - - public ImapFolder getOldFolder() { - return oldFolder; - } - - public ImapFolder getNewFolder() { - return newFolder; - } - - public Message getMessage() { - return message; - } - - protected void dispatch(MoveMessageEventHandler handler) { - handler.onMoveMessageHandler(this); - } - - @Override - public com.google.gwt.event.shared.GwtEvent.Type<MoveMessageEventHandler> getAssociatedType() { - return TYPE; - } - -} -======= -======= ->>>>>>> first commit /**************************************************************** * Licensed to the Apache Software Foundation (ASF) under one * * or more contributor license agreements. See the NOTICE file * @@ -149,7 +71,3 @@ public class MoveMessageEvent extends Gw } } -<<<<<<< HEAD ->>>>>>> first commit -======= ->>>>>>> first commit Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/RefreshMessagesEvent.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/RefreshMessagesEvent.java?rev=1525515&r1=1525514&r2=1525515&view=diff ============================================================================== --- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/RefreshMessagesEvent.java (original) +++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/RefreshMessagesEvent.java Mon Sep 23 07:04:08 2013 @@ -21,10 +21,6 @@ package org.apache.hupa.shared.events; import com.google.gwt.event.shared.GwtEvent; -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> fixed issue#74, finished to add search feature public class RefreshMessagesEvent extends GwtEvent<RefreshMessagesEventHandler> { public final static Type<RefreshMessagesEventHandler> TYPE = new Type<RefreshMessagesEventHandler>(); @@ -48,21 +44,5 @@ public class RefreshMessagesEvent extend public com.google.gwt.event.shared.GwtEvent.Type<RefreshMessagesEventHandler> getAssociatedType() { return TYPE; } -<<<<<<< HEAD -======= -public class RefreshMessagesEvent extends GwtEvent<RefreshMessagesEventHandler>{ - public final static Type<RefreshMessagesEventHandler> TYPE = new Type<RefreshMessagesEventHandler>(); - @Override - protected void dispatch(RefreshMessagesEventHandler handler) { - handler.onRefresh(this); - } - - @Override - public com.google.gwt.event.shared.GwtEvent.Type<RefreshMessagesEventHandler> getAssociatedType() { - return TYPE; - } ->>>>>>> fixed issue#81, add refresh event handler -======= ->>>>>>> fixed issue#74, finished to add search feature } Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/ReplyMessageEvent.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/ReplyMessageEvent.java?rev=1525515&r1=1525514&r2=1525515&view=diff ============================================================================== --- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/ReplyMessageEvent.java (original) +++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/ReplyMessageEvent.java Mon Sep 23 07:04:08 2013 @@ -19,58 +19,10 @@ package org.apache.hupa.shared.events; -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD import org.apache.hupa.shared.domain.ImapFolder; import org.apache.hupa.shared.domain.Message; import org.apache.hupa.shared.domain.MessageDetails; import org.apache.hupa.shared.domain.User; -======= -======= ->>>>>>> first commit -import org.apache.hupa.shared.data.IMAPFolder; -import org.apache.hupa.shared.data.Message; -import org.apache.hupa.shared.data.MessageDetails; -import org.apache.hupa.shared.data.User; -<<<<<<< HEAD -<<<<<<< HEAD ->>>>>>> first commit -======= -import org.apache.hupa.shared.data.Message; -======= ->>>>>>> try to change fetch messages to use RF -import org.apache.hupa.shared.data.MessageDetails; -import org.apache.hupa.shared.data.User; -import org.apache.hupa.shared.proxy.IMAPFolderProxy; ->>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think. -======= ->>>>>>> first commit -======= -import org.apache.hupa.shared.data.Message; -import org.apache.hupa.shared.data.MessageDetails; -<<<<<<< HEAD -import org.apache.hupa.shared.data.User; -<<<<<<< HEAD -import org.apache.hupa.shared.proxy.IMAPFolderProxy; ->>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think. -======= -import org.apache.hupa.shared.proxy.ImapFolder; ->>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now. -======= -import org.apache.hupa.shared.domain.ImapFolder; ->>>>>>> Allow client can use the domain entity interface. -======= -======= ->>>>>>> try to get message details, problem is: -import org.apache.hupa.shared.domain.ImapFolder; -import org.apache.hupa.shared.domain.Message; -import org.apache.hupa.shared.domain.MessageDetails; -import org.apache.hupa.shared.domain.User; ->>>>>>> Make chechsession and login work with RF, with refactoring fetch folders. import com.google.gwt.event.shared.GwtEvent; @@ -78,19 +30,7 @@ public class ReplyMessageEvent extends G public final static Type<ReplyMessageEventHandler> TYPE = new Type<ReplyMessageEventHandler>(); private User user; -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - private IMAPFolderProxy folder; -======= - private IMAPFolder folder; ->>>>>>> first commit -======= - private IMAPFolderProxy folder; ->>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think. -======= private ImapFolder folder; ->>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now. private Message message; private MessageDetails details; private boolean replyAll; @@ -105,19 +45,7 @@ public class ReplyMessageEvent extends G return TYPE; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - public ReplyMessageEvent(User user, IMAPFolderProxy folder, Message message, MessageDetails details, boolean replyAll) { -======= - public ReplyMessageEvent(User user, IMAPFolder folder, Message message, MessageDetails details, boolean replyAll) { ->>>>>>> first commit -======= - public ReplyMessageEvent(User user, IMAPFolderProxy folder, Message message, MessageDetails details, boolean replyAll) { ->>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think. -======= public ReplyMessageEvent(User user, ImapFolder folder, Message message, MessageDetails details, boolean replyAll) { ->>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now. this.user = user; this.folder = folder; this.message = message; @@ -129,19 +57,7 @@ public class ReplyMessageEvent extends G return user; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - public IMAPFolderProxy getFolder() { -======= - public IMAPFolder getFolder() { ->>>>>>> first commit -======= - public IMAPFolderProxy getFolder() { ->>>>>>> Aim to make the front end view work after the server side's IMAPFolder services RF being working, but there are issues on RF's find* method, I think. -======= public ImapFolder getFolder() { ->>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can display folders in west view with RequestFactory now. return folder; } Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/SessionExpireEvent.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/SessionExpireEvent.java?rev=1525515&r1=1525514&r2=1525515&view=diff ============================================================================== --- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/SessionExpireEvent.java (original) +++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/events/SessionExpireEvent.java Mon Sep 23 07:04:08 2013 @@ -19,19 +19,7 @@ package org.apache.hupa.shared.events; -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD import org.apache.hupa.shared.domain.User; -======= -import org.apache.hupa.shared.data.User; ->>>>>>> first commit -======= -import org.apache.hupa.shared.data.User; ->>>>>>> first commit -======= -import org.apache.hupa.shared.domain.User; ->>>>>>> Make chechsession and login work with RF, with refactoring fetch folders. import com.google.gwt.event.shared.GwtEvent; Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/exception/InvalidSessionException.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/exception/InvalidSessionException.java?rev=1525515&r1=1525514&r2=1525515&view=diff ============================================================================== --- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/exception/InvalidSessionException.java (original) +++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/exception/InvalidSessionException.java Mon Sep 23 07:04:08 2013 @@ -1,8 +1,3 @@ -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> re-add server unit tests /**************************************************************** * Licensed to the Apache Software Foundation (ASF) under one * * or more contributor license agreements. See the NOTICE file * @@ -32,50 +27,3 @@ public class InvalidSessionException ext super(message); } } -<<<<<<< HEAD -======= -======= ->>>>>>> first commit -/**************************************************************** - * Licensed to the Apache Software Foundation (ASF) under one * - * or more contributor license agreements. See the NOTICE file * - * distributed with this work for additional information * - * regarding copyright ownership. The ASF licenses this file * - * to you under the Apache License, Version 2.0 (the * - * "License"); you may not use this file except in compliance * - * with the License. You may obtain a copy of the License at * - * * - * http://www.apache.org/licenses/LICENSE-2.0 * - * * - * Unless required by applicable law or agreed to in writing, * - * software distributed under the License is distributed on an * - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * - * KIND, either express or implied. See the License for the * - * specific language governing permissions and limitations * - * under the License. * - ****************************************************************/ - -package org.apache.hupa.shared.exception; - -import net.customware.gwt.dispatch.shared.ActionException; - -/** - * - */ -public class InvalidSessionException extends ActionException{ - - /** - * - */ - private static final long serialVersionUID = 995112620968798947L; - - public InvalidSessionException(String msg) { - super(msg); - } -} -<<<<<<< HEAD ->>>>>>> first commit -======= ->>>>>>> first commit -======= ->>>>>>> re-add server unit tests Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/ContactsResult.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/ContactsResult.java?rev=1525515&r1=1525514&r2=1525515&view=diff ============================================================================== --- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/ContactsResult.java (original) +++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/ContactsResult.java Mon Sep 23 07:04:08 2013 @@ -24,12 +24,6 @@ import java.io.Serializable; import com.google.gwt.user.client.rpc.IsSerializable; -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -import com.google.gwt.user.client.rpc.IsSerializable; - - public class ContactsResult{ @@ -88,164 +82,5 @@ public class ContactsResult{ public void setContacts(Contact[] contacts) { this.contacts = contacts; } -======= -======= ->>>>>>> first commit -import net.customware.gwt.dispatch.shared.Result; -======= ->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files - -public class ContactsResult{ - -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> first commit - public static class Contact implements Result, Serializable { - private static final long serialVersionUID = -8632580327693416473L; - public String mail; - public String realname; - - public Contact() { - } - - public Contact(String mail){ - this.realname = !mail.contains("<") ? "" : - mail.replaceAll("<.+$", "") - .replaceAll("^[\\s\"']+","") - .replaceAll("[\\s\"']+$", ""); - this.mail = mail.replaceAll("^.*<([^>]+)>","$1"); - } - - public Contact(String realname, String mail) { - this.realname = realname; - this.mail = mail; - } - - public String toString() { - return (realname != null ? realname : "") + "<" + mail + ">"; - } - - public String toKey() { - return toString().replaceAll("[^\\w\\d<@>]+", "").toLowerCase(); - } - - } - - private static final long serialVersionUID = -8740775403377441876L; - private Contact[] contacts; - - public ContactsResult() { - } - - public ContactsResult(Contact... contacts) { - this.contacts = contacts; - } - - public Contact[] getContacts() { - return contacts; - } - - public void setContacts(Contact[] contacts) { - this.contacts = contacts; - } -<<<<<<< HEAD ->>>>>>> first commit -======= -======= ->>>>>>> constant changed by manolo - public static class Contact implements Result, Serializable { - private static final long serialVersionUID = -8632580327693416473L; -======= - public static class Contact { ->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files -======= - public static class Contact implements IsSerializable, Serializable{ - private static final long serialVersionUID = -8632580327693416473L; ->>>>>>> fix the serialization issue. - public String mail; - public String realname; - - public Contact() { - } - - public Contact(String address) { -<<<<<<< HEAD -<<<<<<< HEAD - mail = address.replaceAll("^.*<([^>]+)>\\s*$", "$1"); - - realname = mail.equals(address) ? mail : address - // remove the email part - .replaceAll("<[^<>]+>\\s*$", "") - // remove start symbols in the name - .replaceAll("^[\\s\"'<]+", "") - // remove end symbols in the name - .replaceAll("[\\s\"'>]+$", "") - ; -======= - mail = address.replaceAll("^.*<([^>]+)>", "$1"); - - realname = mail.equals(address) ? mail : address - .replaceAll("<.+$", "") - .replaceAll("^[\\s\"']+", "") - .replaceAll("[\\s\"']+$", ""); ->>>>>>> constant changed by manolo -======= - mail = address.replaceAll("^.*<([^>]+)>\\s*$", "$1"); - - realname = mail.equals(address) ? mail : address - // remove the email part - .replaceAll("<[^<>]+>\\s*$", "") - // remove start symbols in the name - .replaceAll("^[\\s\"'<]+", "") - // remove end symbols in the name - .replaceAll("[\\s\"'>]+$", "") - ; ->>>>>>> constantly changed by manolo - - if (realname.isEmpty()) - realname = mail; - } - - public Contact(String realname, String mail) { - this.realname = realname; - this.mail = mail; - } - - public String toString() { - return (realname != null ? realname : "") + "<" + mail + ">"; - } - - public String toKey() { - return toString().replaceAll("[^\\w\\d<@>]+", "").toLowerCase(); - } - - } - - private Contact[] contacts; - - public ContactsResult() { - } - - public ContactsResult(Contact... contacts) { - this.contacts = contacts; - } - - public Contact[] getContacts() { - return contacts; - } - - public void setContacts(Contact[] contacts) { - this.contacts = contacts; - } -<<<<<<< HEAD ->>>>>>> constant changed by manolo -======= ->>>>>>> first commit -======= ->>>>>>> constant changed by manolo } Modified: james/hupa/trunk/widgets/pom.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/widgets/pom.xml?rev=1525515&r1=1525514&r2=1525515&view=diff ============================================================================== --- james/hupa/trunk/widgets/pom.xml (original) +++ james/hupa/trunk/widgets/pom.xml Mon Sep 23 07:04:08 2013 @@ -1,11 +1,3 @@ -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> constantly changed by manolo -======= ->>>>>>> constantly changed by manolo <?xml version="1.0" encoding="ISO-8859-1"?> <!-- Licensed to the Apache Software Foundation (ASF) under one @@ -46,74 +38,10 @@ <groupId>com.google.gwt</groupId> <artifactId>gwt-incubator</artifactId> </dependency> -<<<<<<< HEAD -<<<<<<< HEAD -======= -======= ->>>>>>> first commit -<?xml version="1.0" encoding="ISO-8859-1"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. ---> -<project - xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.hupa</groupId> - <artifactId>hupa-parent</artifactId> - <version>0.0.2-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>hupa-widgets</artifactId> - <packaging>jar</packaging> - <name>Apache James Hupa Widgets</name> - <description>Collection of reusable widgets</description> - <dependencies> - <dependency> - <groupId>com.google.gwt</groupId> - <artifactId>gwt-user</artifactId> - </dependency> - <dependency> - <groupId>com.google.gwt</groupId> - <artifactId>gwt-incubator</artifactId> - </dependency> -<<<<<<< HEAD ->>>>>>> first commit -======= ->>>>>>> constantly changed by manolo -======= ->>>>>>> first commit -======= ->>>>>>> constantly changed by manolo <dependency> <groupId>org.cobogw.gwt</groupId> <artifactId>cobogw</artifactId> </dependency> -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> constantly changed by manolo -======= ->>>>>>> constantly changed by manolo </dependencies> <build> <resources> @@ -132,35 +60,4 @@ </resource> </resources> </build> -<<<<<<< HEAD -<<<<<<< HEAD -======= -======= ->>>>>>> first commit - </dependencies> - <build> - <resources> - <resource> - <directory>src/main/java</directory> - <includes> - <include>**/*.java</include> - <include>**/*.gwt.xml</include> - </includes> - </resource> - <resource> - <directory>src/main/resources</directory> - <includes> - <include>**/*.*</include> - </includes> - </resource> - </resources> - </build> -<<<<<<< HEAD ->>>>>>> first commit -======= ->>>>>>> constantly changed by manolo -======= ->>>>>>> first commit -======= ->>>>>>> constantly changed by manolo </project> Modified: james/hupa/trunk/widgets/src/main/java/org/apache/hupa/Widgets.gwt.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/widgets/src/main/java/org/apache/hupa/Widgets.gwt.xml?rev=1525515&r1=1525514&r2=1525515&view=diff ============================================================================== --- james/hupa/trunk/widgets/src/main/java/org/apache/hupa/Widgets.gwt.xml (original) +++ james/hupa/trunk/widgets/src/main/java/org/apache/hupa/Widgets.gwt.xml Mon Sep 23 07:04:08 2013 @@ -18,52 +18,15 @@ <module> <inherits name='com.google.gwt.user.User'/> <inherits name='com.google.gwt.widgetideas.WidgetIdeas'/> -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= - <inherits name='com.google.gwt.gen2.commonwidget.CommonWidget' /> - <inherits name='com.google.gwt.gen2.table.override.Override'/> - <inherits name='com.google.gwt.gen2.table.ScrollTable'/> ->>>>>>> first commit -======= - <inherits name='com.google.gwt.gen2.commonwidget.CommonWidget' /> - <inherits name='com.google.gwt.gen2.table.override.Override'/> - <inherits name='com.google.gwt.gen2.table.ScrollTable'/> ->>>>>>> first commit -======= ->>>>>>> remove some gwt-incubator stuff <inherits name='org.cobogw.gwt.user.User' /> <source path="widgets"/> -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD <replace-with class="org.apache.hupa.widgets.ui.impl.RndPanelGeneratorCss3"> <when-type-is class="org.apache.hupa.widgets.ui.impl.RndPanelGenerator"/> </replace-with> <replace-with class="org.apache.hupa.widgets.ui.impl.RndPanelGeneratorDecorator"> -======= -======= ->>>>>>> first commit - <replace-with class="org.apache.hupa.widgets.ui.impl.RndPanelGeneratorImpl"> - <when-type-is class="org.apache.hupa.widgets.ui.impl.RndPanelGenerator"/> - </replace-with> - - <replace-with class="org.apache.hupa.widgets.ui.impl.RndPanelGeneratorImplIE"> -<<<<<<< HEAD ->>>>>>> first commit -======= ->>>>>>> first commit -======= - <replace-with class="org.apache.hupa.widgets.ui.impl.RndPanelGeneratorCss3"> - <when-type-is class="org.apache.hupa.widgets.ui.impl.RndPanelGenerator"/> - </replace-with> - - <replace-with class="org.apache.hupa.widgets.ui.impl.RndPanelGeneratorDecorator"> ->>>>>>> merged with main trunk in apache: replacing rounded borders with gwt decorator boxes, fix Hupa-93 Hupa-94, fix IE issue <when-type-is class="org.apache.hupa.widgets.ui.impl.RndPanelGenerator"/> <any> <when-property-is name="user.agent" value="ie6"/> Modified: james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/WidgetsCSS.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/WidgetsCSS.java?rev=1525515&r1=1525514&r2=1525515&view=diff ============================================================================== --- james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/WidgetsCSS.java (original) +++ james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/WidgetsCSS.java Mon Sep 23 07:04:08 2013 @@ -25,17 +25,5 @@ public class WidgetsCSS { public static final String C_loading = "hupa-loading"; public static final String C_hupa_rnd_container = "hupa-rounded"; public static final String C_attachment = "hupa-attachment"; -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD public static final String C_attachment_view = "hupa-attachment-view"; -======= - ->>>>>>> first commit -======= - ->>>>>>> first commit -======= - public static final String C_attachment_view = "hupa-attachment-view"; ->>>>>>> merged with main trunk in apache: replacing rounded borders with gwt decorator boxes, fix Hupa-93 Hupa-94, fix IE issue } Modified: james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/editor/Editor.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/editor/Editor.java?rev=1525515&r1=1525514&r2=1525515&view=diff ============================================================================== --- james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/editor/Editor.java (original) +++ james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/editor/Editor.java Mon Sep 23 07:04:08 2013 @@ -31,40 +31,14 @@ import com.google.gwt.event.logical.shar import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.Element; import com.google.gwt.user.client.Timer; -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.Focusable; import com.google.gwt.user.client.ui.HasHTML; import com.google.gwt.user.client.ui.RichTextArea; -======= -======= ->>>>>>> first commit -import com.google.gwt.user.client.ui.Focusable; -import com.google.gwt.user.client.ui.HasHTML; -import com.google.gwt.user.client.ui.RichTextArea; -import com.google.gwt.user.client.ui.VerticalPanel; - -<<<<<<< HEAD ->>>>>>> first commit -======= ->>>>>>> first commit -======= -import com.google.gwt.user.client.ui.FlowPanel; -import com.google.gwt.user.client.ui.Focusable; -import com.google.gwt.user.client.ui.HasHTML; -import com.google.gwt.user.client.ui.RichTextArea; ->>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width /** * Wysiwyg editor for composing and editing emails in Hupa */ -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width public class Editor extends FlowPanel implements HasHTML, Focusable { RichTextArea area = new RichTextArea(); @@ -76,8 +50,6 @@ public class Editor extends FlowPanel im public Editor(ToolbarConstants constants) { area.ensureDebugId("hupa-editor-area"); -<<<<<<< HEAD -<<<<<<< HEAD area.setHeight("100%"); // Toolbar toolbar = new Toolbar(area, constants); @@ -94,34 +66,6 @@ public class Editor extends FlowPanel im * * When body is available, we put the default style for messages: */ -======= - // area.setSize("100%", "234px"); -======= ->>>>>>> make send text mail work excellently - area.setHeight("100%"); - -// Toolbar toolbar = new Toolbar(area, constants); -// toolbar.ensureDebugId("hupa-editor-toolbar"); - -// super.add(toolbar); - super.add(area); - setWidth("100%"); - setHeight("100%"); - -<<<<<<< HEAD - // Note: rich-area is created in an iframe, so Hupa's style sheets - // are not available, unless we inject them to the generated iframe - // - // When body is available, we put the default style for messages: ->>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width -======= - /* - * Note: rich-area is created in an iframe, so Hupa's style sheets are - * not available, unless we inject them to the generated iframe - * - * When body is available, we put the default style for messages: - */ ->>>>>>> make send text mail work excellently area.addInitializeHandler(new InitializeHandler() { public void onInitialize(InitializeEvent event) { setBodyStyleAttribute("fontFamily", "arial"); @@ -129,43 +73,20 @@ public class Editor extends FlowPanel im } }); -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> make send text mail work excellently /* * When the users writes in-line comments in replies, the text has to be * leftIdented. Right now, I've implemented this feature only in gecko * browsers, for other browsers the user has to push the leftIdent * button. */ -<<<<<<< HEAD -======= - // When the users writes in-line comments in replies, the text has to be - // leftIdented. - // Right now, I've implemented this feature only in gecko browsers, for - // other browsers - // the user has to push the leftIdent button. ->>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width -======= ->>>>>>> make send text mail work excellently if (getUA().equals("ff")) addNewlineHandlersForFireFox(); } -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> fixed issue#62 public RichTextArea getArea(){ return area; } -<<<<<<< HEAD -======= ->>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width -======= ->>>>>>> fixed issue#62 @Override public void setSize(String width, String height) { @@ -174,27 +95,13 @@ public class Editor extends FlowPanel im @Override public void setWidth(String width) { -<<<<<<< HEAD -<<<<<<< HEAD super.setWidth(width); -======= ->>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width -======= - super.setWidth(width); ->>>>>>> fixed issue#62 area.setWidth(width); } @Override public void setHeight(String height) { -<<<<<<< HEAD -<<<<<<< HEAD - super.setHeight(height); -======= ->>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width -======= super.setHeight(height); ->>>>>>> fixed issue#62 area.setHeight(height); } @@ -291,16 +198,7 @@ public class Editor extends FlowPanel im event.preventDefault(); } if (!doNline -<<<<<<< HEAD -<<<<<<< HEAD - && (event.getCharCode() == KeyCodes.KEY_DOWN || event.getCharCode() == KeyCodes.KEY_UP)) { -======= - && (event.getCharCode() == KeyCodes.KEY_DOWN || event - .getCharCode() == KeyCodes.KEY_UP)) { ->>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width -======= && (event.getCharCode() == KeyCodes.KEY_DOWN || event.getCharCode() == KeyCodes.KEY_UP)) { ->>>>>>> make send text mail work excellently doNline = true; } } @@ -324,187 +222,4 @@ public class Editor extends FlowPanel im return "other"; }-*/; -<<<<<<< HEAD -======= -======= ->>>>>>> first commit -public class Editor extends VerticalPanel implements HasHTML, Focusable { - - RichTextArea area = new RichTextArea(); - boolean isNewMessage = true; - - public Editor() { - this((ToolbarConstants)GWT.create(ToolbarConstants.class)); - } - - public Editor(ToolbarConstants constants) { - area.ensureDebugId("hupa-editor-area"); - area.setSize("100%", "234px"); - - Toolbar toolbar = new Toolbar(area, constants); - toolbar.ensureDebugId("hupa-editor-toolbar"); - - super.setStyleName("hupa-editor"); - super.add(toolbar); - super.add(area); - super.setSize("100%", "100%"); - - - // Note: rich-area is created in an iframe, so Hupa's style sheets - // are not available, unless we inject them to the generated iframe - // - // When body is available, we put the default style for messages: - area.addInitializeHandler(new InitializeHandler() { - public void onInitialize(InitializeEvent event) { - setBodyStyleAttribute("fontFamily", "arial"); - setBodyStyleAttribute("fontSize", "12px"); - } - }); - - // When the users writes in-line comments in replies, the text has to be leftIdented. - // Right now, I've implemented this feature only in gecko browsers, for other browsers - // the user has to push the leftIdent button. - if (getUA().equals("ff")) - addNewlineHandlersForFireFox(); - - } - - @Override - public void setSize(String width, String height) { - area.setSize(width, height); - } - - @Override - public void setWidth(String width){ - area.setWidth(width); - } - - @Override - public void setHeight(String height){ - area.setHeight(height); - } - - public String getHTML() { - return area.getHTML(); - } - - public void setHTML(String html) { - isNewMessage = html.trim().length() > 0; - area.setHTML(html); - } - - public String getText() { - return area.getText(); - } - - public void setText(String text) { - area.setText(text); - } - - public void setBodyStyleAttribute(final String key, final String value) { - DOM.setStyleAttribute(getBody(area.getElement()), key, value); - } - - public int getTabIndex() { - return area.getTabIndex(); - } - - public void setAccessKey(char key) { - area.setAccessKey(key); - } - - public void setFocus(boolean focused) { - area.setFocus(focused); - } - - public void setTabIndex(int index) { - area.setTabIndex(index); - } - - // isEnabled and setEnabled dont work in richtextarea due to a bug, - // I've sent a patch to gwt, when it is accepted this native methods can be - // removed - public void setEnabled(boolean b) { - setEnabled(area.getElement(), b); - } - - public boolean isEnabled() { - return isEnabled(area.getElement()); - } - - private native void setEnabled(Element iframe, boolean b) /*-{ - var doc = iframe.contentWindow.document; - if (doc.body.contentEditable) - doc.body.contentEditable = b; - else - doc.designMode = b ? 'On' : 'Off'; - }-*/; - - private native boolean isEnabled(Element iframe) /*-{ - var doc = iframe.contentWindow.document; - alert((doc.designMode.toUpperCase()) == 'ON'); - if (doc.body.contentEditable) { - alert("editable ???"); - return doc.body.contentEditable; - } else { - var ret = (((doc.designMode).toUpperCase()) == 'ON') ? true : false; - alert(ret); - return ret; - } - }-*/; - - private native Element getBody(Element frame) /*-{ - return frame.contentWindow.document.body; - }-*/; - - private void addNewlineHandlersForFireFox() { - area.addClickHandler(new ClickHandler() { - public void onClick(ClickEvent event) { - doNline = true; - } - }); - area.addFocusHandler(new FocusHandler() { - public void onFocus(FocusEvent event) { - doNline = true; - } - }); - area.addKeyPressHandler(new KeyPressHandler() { - public void onKeyPress(KeyPressEvent event) { - if (!isNewMessage) { - if (doNline && event.getCharCode() == KeyCodes.KEY_ENTER) { - doNline = false; - leftIdentTimer.schedule(10); - event.preventDefault(); - } - if (!doNline && (event.getCharCode() == KeyCodes.KEY_DOWN || event.getCharCode() == KeyCodes.KEY_UP)) { - doNline = true; - } - } - } - }); - - } - - boolean doNline = true; - private Timer leftIdentTimer = new Timer(){ - public void run() { - area.getFormatter().insertHTML("<br/>\n"); - area.getFormatter().leftIndent(); - } - }; - - private native String getUA() /*-{ - var ua = navigator.userAgent.toLowerCase(); - if (ua.indexOf("gecko") != -1) - return "ff"; - return "other"; - }-*/; - - -<<<<<<< HEAD ->>>>>>> first commit -======= ->>>>>>> first commit -======= ->>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width } Modified: james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/MultiValueSuggestArea.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/MultiValueSuggestArea.java?rev=1525515&r1=1525514&r2=1525515&view=diff ============================================================================== --- james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/MultiValueSuggestArea.java (original) +++ james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/MultiValueSuggestArea.java Mon Sep 23 07:04:08 2013 @@ -19,21 +19,9 @@ package org.apache.hupa.widgets.ui; -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD import com.google.gwt.event.dom.client.KeyCodes; import com.google.gwt.event.dom.client.KeyDownEvent; import com.google.gwt.event.dom.client.KeyDownHandler; -======= ->>>>>>> first commit -======= ->>>>>>> first commit -======= -import com.google.gwt.event.dom.client.KeyCodes; -import com.google.gwt.event.dom.client.KeyDownEvent; -import com.google.gwt.event.dom.client.KeyDownHandler; ->>>>>>> Avoid entering a new-line in the textarea when selecting a suggestion element import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.Focusable; @@ -64,11 +52,6 @@ public class MultiValueSuggestArea exten // instead of overriding getText and setText from SuggestBox because a bug in the implementation // I've sent a patch to gwt. super(oracle, new TextArea() { -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Avoid entering a new-line in the textarea when selecting a suggestion element { // Avoid entering a new-line when selecting a suggestion element @@ -81,13 +64,6 @@ public class MultiValueSuggestArea exten } }); } -<<<<<<< HEAD -======= ->>>>>>> first commit -======= ->>>>>>> first commit -======= ->>>>>>> Avoid entering a new-line in the textarea when selecting a suggestion element String search = null; @@ -112,36 +88,12 @@ public class MultiValueSuggestArea exten // this methods in the the box implementation @Override public String getValue() { -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD return DOM.getElementProperty(getValueBox().getElement(), "value"); -======= - return DOM.getElementProperty(getTextBox().getElement(), "value"); ->>>>>>> first commit -======= - return DOM.getElementProperty(getTextBox().getElement(), "value"); ->>>>>>> first commit -======= - return DOM.getElementProperty(getValueBox().getElement(), "value"); ->>>>>>> remove some warnings and create the AbstractPlace that can give place infomation } @Override public void setValue(String text) { -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - DOM.setElementProperty(getValueBox().getElement(), "value", text); -======= - DOM.setElementProperty(getTextBox().getElement(), "value", text); ->>>>>>> first commit -======= - DOM.setElementProperty(getTextBox().getElement(), "value", text); ->>>>>>> first commit -======= DOM.setElementProperty(getValueBox().getElement(), "value", text); ->>>>>>> remove some warnings and create the AbstractPlace that can give place infomation } } Modified: james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/RndPanel.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/RndPanel.java?rev=1525515&r1=1525514&r2=1525515&view=diff ============================================================================== --- james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/RndPanel.java (original) +++ james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/RndPanel.java Mon Sep 23 07:04:08 2013 @@ -25,17 +25,6 @@ import com.google.gwt.user.client.ui.Flo import com.google.gwt.user.client.ui.Widget; import org.apache.hupa.widgets.ui.impl.RndPanelGenerator; -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= -import org.apache.hupa.widgets.ui.impl.RndPanelGeneratorImpl; ->>>>>>> first commit -======= -import org.apache.hupa.widgets.ui.impl.RndPanelGeneratorImpl; ->>>>>>> first commit -======= ->>>>>>> merged with main trunk in apache: replacing rounded borders with gwt decorator boxes, fix Hupa-93 Hupa-94, fix IE issue /** * Widget which renders a rounded panel. --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
