remove useless files

git-svn-id: https://svn.apache.org/repos/asf/james/hupa/trunk@1526350 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/client/src/main/java/org/apache/hupa/client/place/FolderPlace.java~HEAD b/client/src/main/java/org/apache/hupa/client/place/FolderPlace.java~HEAD
deleted file mode 100644
index 69cf7be..0000000
--- a/client/src/main/java/org/apache/hupa/client/place/FolderPlace.java~HEAD
+++ /dev/null
@@ -1,70 +0,0 @@
-/****************************************************************
- * 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.client.place;
-
-import com.google.gwt.place.shared.PlaceTokenizer;
-import com.google.gwt.place.shared.Prefix;
-
-public class FolderPlace extends HupaPlace {
-
-	private String token;
-
-	public FolderPlace(String token) {
-		this.token = token;
-	}
-
-	public String getToken() {
-		return token;
-	}
-
-	@Prefix("folder")
-	public static class Tokenizer implements PlaceTokenizer<FolderPlace> {
-
-		@Override
-		public FolderPlace getPlace(String token) {
-			return new FolderPlace(token);
-		}
-
-		@Override
-		public String getToken(FolderPlace place) {
-			return place.getToken();
-		}
-	}
-//
-//	@Override
-//	public boolean equals(Object o) {
-//		if (o == null)
-//			return false;
-//		if (o == this)
-//			return true;
-//		if (o.getClass() != getClass())
-//			return false;
-//		FolderPlace place = (FolderPlace) o;
-//		return (token == place.token || (token != null && token.equals(place.token)));
-//	}
-//
-//	@Override
-//	public int hashCode() {
-//		final int prime = 31;
-//		int result = 1;
-//		result = prime * result + ((token == null) ? 0 : token.hashCode());
-//		return result;
-//	}
-}
diff --git a/client/src/main/java/org/apache/hupa/client/place/MailFolderPlace.java~HEAD b/client/src/main/java/org/apache/hupa/client/place/MailFolderPlace.java~HEAD
deleted file mode 100644
index ce39dba..0000000
--- a/client/src/main/java/org/apache/hupa/client/place/MailFolderPlace.java~HEAD
+++ /dev/null
@@ -1,85 +0,0 @@
-package org.apache.hupa.client.place;
-
-import org.apache.hupa.shared.data.User;
-import org.apache.hupa.shared.proxy.IMAPFolderProxy;
-
-import com.google.gwt.place.shared.Place;
-import com.google.gwt.place.shared.PlaceTokenizer;
-import com.google.gwt.place.shared.Prefix;
-
-public class MailFolderPlace extends Place {
-
-	private static final String PREFIX = "folder";
-	private User user;
-	private String folderName = "";
-	
-	public String getFolderName(){
-		return folderName;
-	}
-
-	public void setFolderName(String folderName){
-		this.folderName = folderName;
-	}
-	/**
-	 * equality test based on Class type, to let different instance of this
-	 * Place class to be equals for CachingActivityMapper test on Place equality
-	 * 
-	 * @param otherPlace
-	 *            the place to compare with
-	 * @return true if this place and otherPlace are of the same Class type
-	 */
-	@Override
-	public boolean equals(Object otherPlace) {
-		return this == otherPlace ;//|| (otherPlace != null && getClass() == otherPlace.getClass());
-	}
-
-	@Override
-	public int hashCode() {
-		return PREFIX.hashCode();
-	}
-
-	public String toString() {
-		return this.getClass().getName() + "->[Inbox]" + folderName;
-	}
-
-	public MailFolderPlace with(User user) {
-		this.user = user;
-		return this;
-	}
-
-	public User getUser() {
-		return user;
-	}
-
-	@Prefix(PREFIX)
-	public static class Tokenizer implements PlaceTokenizer<MailFolderPlace> {
-
-		@Override
-		public MailFolderPlace getPlace(String token) {
-			MailFolderPlace p = new MailFolderPlace();
-			p.setFolderName(token);
-			return p;
-		}
-
-		@Override
-		public String getToken(MailFolderPlace place) {
-			return place.getFolderName();
-		}
-	}
-	private IMAPFolderProxy folder;
-	private String searchValue;
-	
-	public IMAPFolderProxy getFolder() {
-		return folder;
-	}
-	public String getSearchValue() {
-		return searchValue;
-	}
-	public MailFolderPlace with(User user, IMAPFolderProxy folder, String searchValue) {
-		this.folder = folder;
-		this.searchValue = searchValue;
-		this.user = user;
-		this.folderName = folder.getName();
-		return this;
-	}
-}
diff --git a/client/src/main/java/org/apache/hupa/client/rf/ImapFolderRequest.java~HEAD b/client/src/main/java/org/apache/hupa/client/rf/ImapFolderRequest.java~HEAD
deleted file mode 100644
index c4b6868..0000000
--- a/client/src/main/java/org/apache/hupa/client/rf/ImapFolderRequest.java~HEAD
+++ /dev/null
@@ -1,35 +0,0 @@
-/****************************************************************
- * 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.client.rf;
-
-import java.util.List;
-
-import org.apache.hupa.server.ioc.IocRfServiceLocator;
-import org.apache.hupa.server.service.ImapFolderService;
-import org.apache.hupa.shared.domain.ImapFolder;
-
-import com.google.web.bindery.requestfactory.shared.Request;
-import com.google.web.bindery.requestfactory.shared.RequestContext;
-import com.google.web.bindery.requestfactory.shared.Service;
-
-@Service(value = ImapFolderService.class, locator = IocRfServiceLocator.class)
-public interface ImapFolderRequest extends RequestContext {
-	Request<List<ImapFolder>> requestFolders();
-}
diff --git a/client/src/main/java/org/apache/hupa/client/ui/ComposeView.java~HEAD b/client/src/main/java/org/apache/hupa/client/ui/ComposeView.java~HEAD
deleted file mode 100644
index 1ec0619..0000000
--- a/client/src/main/java/org/apache/hupa/client/ui/ComposeView.java~HEAD
+++ /dev/null
@@ -1,456 +0,0 @@
-/****************************************************************
- * 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.client.ui;
-
-import org.apache.hupa.client.HupaCSS;
-import org.apache.hupa.client.HupaConstants;
-import org.apache.hupa.client.HupaMessages;
-import org.apache.hupa.client.activity.ComposeActivity;
-import org.apache.hupa.client.validation.AddStyleAction;
-import org.apache.hupa.client.validation.EmailListValidator;
-import org.apache.hupa.client.validation.NotEmptyValidator;
-import org.apache.hupa.client.validation.SetFocusAction;
-import org.apache.hupa.shared.SConsts;
-import org.apache.hupa.widgets.editor.Editor;
-import org.apache.hupa.widgets.editor.Toolbar;
-import org.apache.hupa.widgets.ui.MultiValueSuggestArea;
-
-import com.google.gwt.core.client.GWT;
-import com.google.gwt.event.dom.client.HasClickHandlers;
-import com.google.gwt.resources.client.CssResource;
-import com.google.gwt.uibinder.client.UiBinder;
-import com.google.gwt.uibinder.client.UiField;
-import com.google.gwt.user.client.ui.Anchor;
-import com.google.gwt.user.client.ui.Button;
-import com.google.gwt.user.client.ui.Composite;
-import com.google.gwt.user.client.ui.DockLayoutPanel;
-import com.google.gwt.user.client.ui.FlexTable;
-import com.google.gwt.user.client.ui.FlexTable.FlexCellFormatter;
-import com.google.gwt.user.client.ui.FlowPanel;
-import com.google.gwt.user.client.ui.HTMLTable.RowFormatter;
-import com.google.gwt.user.client.ui.HasHTML;
-import com.google.gwt.user.client.ui.HasText;
-import com.google.gwt.user.client.ui.Label;
-import com.google.gwt.user.client.ui.ListBox;
-import com.google.gwt.user.client.ui.SimplePanel;
-import com.google.gwt.user.client.ui.TextArea;
-import com.google.gwt.user.client.ui.TextBox;
-import com.google.inject.Inject;
-
-import eu.maydu.gwt.validation.client.DefaultValidationProcessor;
-import eu.maydu.gwt.validation.client.ValidationProcessor;
-import eu.maydu.gwt.validation.client.i18n.ValidationMessages;
-import gwtupload.client.BaseUploadStatus;
-import gwtupload.client.IFileInput.FileInputType;
-import gwtupload.client.IUploadStatus;
-import gwtupload.client.IUploader;
-import gwtupload.client.MultiUploader;
-
-public class ComposeView extends Composite implements ComposeActivity.Displayable {
-
-	@UiField protected DockLayoutPanel thisPanel;
-	@UiField protected SimplePanel header;
-	@UiField protected FlexTable headerTable;
-	@UiField protected SimplePanel editorToolBar;
-	@UiField protected SimplePanel composeEditor;
-	@UiField protected FlowPanel attach;
-	@UiField protected Style style;
-	private ListBox selectFrom;
-	/* we only need one instance for all suggestion-boxes */
-	private MultiValueSuggestArea toSuggest = new MultiValueSuggestArea(" ,@<>");
-	private MultiValueSuggestArea ccSuggest = new MultiValueSuggestArea(toSuggest.getOracle());
-	private MultiValueSuggestArea bccSuggest = new MultiValueSuggestArea(toSuggest.getOracle());
-	private TextBox subject = new TextBox();
-
-	private Button sendButton;
-	private Button saveButton;
-	private Button cancelButton;
-
-	private Anchor addCcButton;
-	private Anchor addBccButton;
-	private Anchor addReplyButton;
-	private Anchor addFollowupButton;
-
-	private Anchor _CcButton = new Anchor("x");
-	private Anchor _BccButton = new Anchor("x");
-	private Anchor _ReplyButton = new Anchor("x");
-	private Anchor _FollowupButton = new Anchor("x");
-
-	private FlexCellFormatter cellFormatter;
-	private RowFormatter rowFormatter;
-
-	private Editor editor;
-
-	private ValidationProcessor validator;
-	private MultiUploader uploader = null;
-
-	private static final int ROW_FROM = 0;
-	private static final int ROW_TO = 1;
-	private static final int ROW_CC = 2;
-	private static final int ROW_BCC = 3;
-	private static final int ROW_REPLY = 4;
-	private static final int ROW_FOLLOWUP = 5;
-	private static final int ROW_SWITCH = 6;
-	private static final int ROW_SUBJECT = 7;
-
-	private static final int ROW_HEIGHT = 33;
-
-	interface Style extends CssResource {
-		String show();
-		String hide();
-		String iconlink();
-		String add();
-		String cancel();
-		String formlinks();
-		String left();
-		String right();
-		String operation();
-	}
-
-	@Inject
-	public ComposeView(HupaConstants constants, HupaMessages messages) {
-		initWidget(binder.createAndBindUi(this));
-		initFormatters();
-		createFirstColumn();
-		createSecondColumn();
-		bindValidators(messages);
-		createEditor(constants);
-	}
-
-	private void createEditor(HupaConstants constants) {
-		editor = new Editor();
-		BaseUploadStatus uploadStatus = new BaseUploadStatus();
-		uploadStatus.setCancelConfiguration(IUploadStatus.DEFAULT_CANCEL_CFG);
-		uploader = new MultiUploader(FileInputType.ANCHOR, uploadStatus);
-		uploader.setServletPath(GWT.getModuleBaseURL() + SConsts.SERVLET_UPLOAD);
-		uploader.avoidRepeatFiles(true);
-		uploader.setI18Constants(constants);
-		attach.add(uploader);
-
-		Toolbar toolbar = new Toolbar(editor.getArea(), constants);
-		toolbar.ensureDebugId("hupa-editor-toolbar");
-		editorToolBar.add(toolbar);
-		composeEditor.add(editor);
-	}
-
-	private void bindValidators(HupaMessages messages) {
-		SetFocusAction fAction = new SetFocusAction();
-		AddStyleAction sAction = new AddStyleAction(HupaCSS.C_validate, 3000);
-		validator = new DefaultValidationProcessor(new ValidationMessages(messages));
-		validator.addValidators("cc",
-				new EmailListValidator(getCc()).addActionForFailure(sAction).addActionForFailure(fAction));
-		validator.addValidators("bcc", new EmailListValidator(getBcc()).addActionForFailure(sAction)
-				.addActionForFailure(fAction));
-		validator.addValidators("to",
-				new EmailListValidator(getTo()).addActionForFailure(sAction).addActionForFailure(fAction),
-				new NotEmptyValidator(getTo()).addActionForFailure(sAction).addActionForFailure(fAction));
-	}
-
-	private void initFormatters() {
-		cellFormatter = headerTable.getFlexCellFormatter();
-		rowFormatter = headerTable.getRowFormatter();
-	}
-
-	private void createSecondColumn() {
-		selectFrom = new ListBox();
-		sendButton = new Button("Send message");
-		saveButton = new Button("Save as draft");
-		cancelButton = new Button("Cancel");
-		FlowPanel operationPanel = new FlowPanel();
-		FlowPanel contactPanel = new FlowPanel();
-		FlowPanel buttonPanel = new FlowPanel();
-		contactPanel.add(selectFrom);
-		contactPanel.addStyleName(style.left());
-		// buttonPanel.add(new Anchor("Edit identities"));
-		buttonPanel.add(sendButton);
-		buttonPanel.add(saveButton);
-		buttonPanel.add(cancelButton);
-		buttonPanel.addStyleName(style.right());
-		operationPanel.add(contactPanel);
-		operationPanel.add(buttonPanel);
-		operationPanel.addStyleName(style.operation());
-		headerTable.setWidget(ROW_FROM, 1, operationPanel);
-		headerTable.setWidget(ROW_TO, 1, toSuggest);
-		headerTable.setWidget(ROW_CC, 1, ccSuggest);
-		headerTable.setWidget(ROW_BCC, 1, bccSuggest);
-		headerTable.setWidget(ROW_REPLY, 1, create());
-		headerTable.setWidget(ROW_FOLLOWUP, 1, create());
-		headerTable.setWidget(ROW_SWITCH, 1, createOpsPanel());
-		cellFormatter.addStyleName(ROW_SWITCH, 1, style.formlinks());
-		headerTable.setWidget(ROW_SUBJECT, 1, subject);
-		rowFormatter.addStyleName(ROW_CC, style.hide());
-		rowFormatter.addStyleName(ROW_BCC, style.hide());
-		rowFormatter.addStyleName(ROW_REPLY, style.hide());
-		rowFormatter.addStyleName(ROW_FOLLOWUP, style.hide());
-	}
-
-	private void createFirstColumn() {
-		headerTable.setWidget(ROW_FROM, 0, new Label("From"));
-		headerTable.setWidget(ROW_TO, 0, new Label("To"));
-		headerTable.setWidget(ROW_CC, 0, createCell("Cc", _CcButton));
-		headerTable.setWidget(ROW_BCC, 0, createCell("Bcc", _BccButton));
-		headerTable.setWidget(ROW_REPLY, 0, createCell("Reply", _ReplyButton));
-		headerTable.setWidget(ROW_FOLLOWUP, 0, createCell("Follow", _FollowupButton));
-		headerTable.setWidget(ROW_SWITCH, 0, new Label(""));
-		headerTable.setWidget(ROW_SUBJECT, 0, new Label("Subject"));
-	}
-
-	private FlowPanel createCell(String labelText, Anchor w) {
-		FlowPanel ccCell = new FlowPanel();
-		Label cc = new Label(labelText);
-		cc.addStyleName(style.left());
-		ccCell.add(cc);
-		w.addStyleName(style.iconlink());
-		w.addStyleName(style.cancel());
-		ccCell.add(w);
-		return ccCell;
-	}
-
-	private FlowPanel createOpsPanel() {
-		FlowPanel addOpsPanel = new FlowPanel();
-		addCcButton = new Anchor("Add Cc");
-		addCcButton.addStyleName(style.iconlink());
-		addCcButton.addStyleName(style.add());
-		addBccButton = new Anchor("Add Bcc");
-		addBccButton.addStyleName(style.iconlink());
-		addBccButton.addStyleName(style.add());
-		addReplyButton = new Anchor("Add Reply-To");
-		addReplyButton.addStyleName(style.iconlink());
-		addReplyButton.addStyleName(style.add());
-		addFollowupButton = new Anchor("Add Followup-To");
-		addFollowupButton.addStyleName(style.iconlink());
-		addFollowupButton.addStyleName(style.add());
-		addOpsPanel.add(addCcButton);
-		addOpsPanel.add(addBccButton);
-		// TODO the other operations
-		// addOpsPanel.add(addReplyButton);
-		// addOpsPanel.add(addFollowupButton);
-		return addOpsPanel;
-	}
-
-	HasText emptyText = new HasText() {
-		@Override
-		public String getText() {
-			return "";
-		}
-		@Override
-		public void setText(String text) {
-		}
-	};
-
-	@Override
-	public HasText getTo() {
-		return toSuggest;
-	}
-
-	@Override
-	public HasText getCc() {
-		if (isShowing(ROW_CC))
-			return ccSuggest;
-		else
-			return emptyText;
-	}
-
-	@Override
-	public HasText getBcc() {
-		if (isShowing(ROW_BCC))
-			return bccSuggest;
-		else
-			return emptyText;
-	}
-
-	@Override
-	public HasClickHandlers getSendClick() {
-		return sendButton;
-	}
-	
-	@Override
-	public HasClickHandlers getCancelClick(){
-		return cancelButton;
-	}
-
-	@Override
-	public HasClickHandlers getCcClick() {
-		return addCcButton;
-	}
-
-	@Override
-	public HasClickHandlers get_CcClick() {
-		return _CcButton;
-	}
-
-	@Override
-	public HasClickHandlers getBccClick() {
-		return addBccButton;
-	}
-
-	@Override
-	public HasClickHandlers get_BccClick() {
-		return _BccButton;
-	}
-
-	@Override
-	public HasClickHandlers getReplyClick() {
-		return addReplyButton;
-	}
-
-	@Override
-	public HasClickHandlers get_ReplyClick() {
-		return _ReplyButton;
-	}
-
-	@Override
-	public HasClickHandlers getFollowupClick() {
-		return addFollowupButton;
-	}
-
-	@Override
-	public HasClickHandlers get_FollowupClick() {
-		return _FollowupButton;
-	}
-
-	@Override
-	public HasText getSubject() {
-		return subject;
-	}
-
-	@Override
-	public boolean validate() {
-		return this.validator.validate();
-	}
-
-	@Override
-	public String getFromText() {
-		// TODO hardcode to the first identifier
-		return selectFrom.getItemText(0);
-	}
-
-	@Override
-	public ListBox getFromList() {
-		return selectFrom;
-	}
-
-	@Override
-	public HasText getMessage() {
-		return editor;
-	}
-
-	@Override
-	public HasHTML getMessageHTML() {
-		return editor;
-	}
-
-	@Override
-	public IUploader getUploader() {
-		return uploader;
-	}
-
-	@Override
-	public void showCc() {
-		showRow(ROW_CC);
-		// hide(addCcButton);
-	}
-
-	@Override
-	public void hideCc() {
-		hideRow(ROW_CC);
-		// show(addCcButton);
-	}
-
-	@Override
-	public void showBcc() {
-		showRow(ROW_BCC);
-		// hide(addBccButton);
-	}
-
-	@Override
-	public void hideBcc() {
-		hideRow(ROW_BCC);
-		// show(addBccButton);
-	}
-
-	@Override
-	public void showReply() {
-		showRow(ROW_REPLY);
-		// hide(addReplyButton);
-	}
-
-	@Override
-	public void hideReply() {
-		hideRow(ROW_REPLY);
-		// show(addReplyButton);
-	}
-
-	@Override
-	public void showFollowup() {
-		showRow(ROW_FOLLOWUP);
-		// hide(addFollowupButton);
-	}
-
-	@Override
-	public void hideFollowup() {
-		hideRow(ROW_FOLLOWUP);
-		// show(addFollowupButton);
-	}
-	
-
-	@Override
-    public void fillContactList(String[] contacts){
-        toSuggest.fillOracle(contacts);
-    }
-
-	private void showRow(int row) {
-		if (isShowing(row)) {
-			return;
-		}
-		rowFormatter.removeStyleName(row, style.hide());
-		rowFormatter.addStyleName(row, style.show());
-		thisPanel.setWidgetSize(header, thisPanel.getWidgetSize(header) + ROW_HEIGHT);
-	}
-
-	private void hideRow(int row) {
-		if (isHiding(row)) {
-			return;
-		}
-		rowFormatter.removeStyleName(row, style.show());
-		rowFormatter.addStyleName(row, style.hide());
-		thisPanel.setWidgetSize(header, thisPanel.getWidgetSize(header) - ROW_HEIGHT);
-	}
-
-	private boolean isShowing(int row) {
-		return rowFormatter.getStyleName(row).contains(style.show());
-	}
-
-	private boolean isHiding(int row) {
-		return rowFormatter.getStyleName(row).contains(style.hide());
-	}
-
-	// TODO
-	private TextArea create() {
-		TextArea t = new TextArea();
-		return t;
-	}
-
-	interface ComposeUiBinder extends UiBinder<DockLayoutPanel, ComposeView> {
-	}
-
-	private static ComposeUiBinder binder = GWT.create(ComposeUiBinder.class);
-
-}
diff --git a/client/src/main/java/org/apache/hupa/client/ui/LabelPropertiesView.ui.xml~HEAD b/client/src/main/java/org/apache/hupa/client/ui/LabelPropertiesView.ui.xml~HEAD
deleted file mode 100644
index 36e7960..0000000
--- a/client/src/main/java/org/apache/hupa/client/ui/LabelPropertiesView.ui.xml~HEAD
+++ /dev/null
@@ -1,92 +0,0 @@
-<!-- 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. -->
-
-<ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder'
-	xmlns:g='urn:import:com.google.gwt.user.client.ui' ui:generateFormat='com.google.gwt.i18n.rebind.format.PropertiesFormat'
-	ui:generateLocales='default'>
-	<ui:style>
-		.propform fieldset {
-			margin-bottom: 20px;
-			border: 0;
-			padding: 0;
-		}
-		
-		.propform fieldset legend {
-			display: block;
-			font-size: 14px;
-			font-weight: bold;
-			padding-bottom: 10px;
-			margin-bottom: 0;
-		}
-		
-		.propform fieldset fieldset legend {
-			color: #666;
-			font-size: 12px;
-		}
-		
-		fieldset.floating {
-			float: left;
-			margin-right: 10px;
-			margin-bottom: 10px;
-		}
-		
-		table {
-			border-collapse: collapse;
-			border-spacing: 0;
-		}
-		
-		table.attribute {
-			border-spacing: 0;
-			border-collapse: collapse;
-		}
-		
-		table.attribute td {
-			width: 80%;
-			padding: 4px 10px;
-			background: #eee;
-			border-bottom: 2px solid #fff;
-		}
-		
-		table.noBorder td {
-			border: 0;
-		}
-	</ui:style>
-	<g:DecoratorPanel addStyleNames="{style.propform}">
-		<g:CaptionPanel captionText="Properties">
-			<g:VerticalPanel ui:field="propContainer">
-				<g:CaptionPanel captionText="Location">
-					<g:VerticalPanel addStyleNames="{style.attribute}">
-						<g:HorizontalPanel addStyleNames="{style.noBorder}">
-							<g:Label>
-								<ui:msg key='folderName'>Folder Name:</ui:msg>
-							</g:Label>
-							<g:TextBox ui:field='name' name="_name" />
-						</g:HorizontalPanel>
-						<g:HorizontalPanel addStyleNames="{style.noBorder}">
-							<g:Label>
-								<ui:msg key='parentFolder'>Parent Folder:</ui:msg>
-							</g:Label>
-							<g:ListBox ui:field='parent'>
-								<g:item value="1">---</g:item>
-							</g:ListBox>
-						</g:HorizontalPanel>
-					</g:VerticalPanel>
-				</g:CaptionPanel>
-				<g:CaptionPanel ui:field="information" captionText="Information">
-					<g:VerticalPanel addStyleNames="{style.attribute}">
-					</g:VerticalPanel>
-				</g:CaptionPanel>
-				<g:Button ui:field="save">Save</g:Button>
-			</g:VerticalPanel>
-		</g:CaptionPanel>
-	</g:DecoratorPanel>
-
-</ui:UiBinder>
\ No newline at end of file
diff --git a/client/src/main/java/org/apache/hupa/client/ui/WidgetContainerDisplayable.java~HEAD b/client/src/main/java/org/apache/hupa/client/ui/WidgetContainerDisplayable.java~HEAD
deleted file mode 100644
index d5e6a08..0000000
--- a/client/src/main/java/org/apache/hupa/client/ui/WidgetContainerDisplayable.java~HEAD
+++ /dev/null
@@ -1,32 +0,0 @@
-/****************************************************************
- * 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.client.ui;
-
-import com.google.gwt.user.client.ui.IsWidget;
-import com.google.gwt.user.client.ui.Widget;
-
-public interface WidgetContainerDisplayable extends IsWidget {
-
-    void addWidget( Widget widget );
-
-    void removeWidget( Widget widget );
-
-    void showWidget( Widget widget );
-}
diff --git a/client/src/main/java/org/apache/hupa/client/ui/WidgetDisplayable.java~HEAD b/client/src/main/java/org/apache/hupa/client/ui/WidgetDisplayable.java~HEAD
deleted file mode 100644
index 55d6f0e..0000000
--- a/client/src/main/java/org/apache/hupa/client/ui/WidgetDisplayable.java~HEAD
+++ /dev/null
@@ -1,27 +0,0 @@
-/****************************************************************
- * 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.client.ui;
-
-import com.google.gwt.user.client.ui.Widget;
-
-public interface WidgetDisplayable extends Displayable {
-	Widget asWidget();
-
-}
diff --git a/client/src/main/java/org/apache/hupa/client/ui/_ToolPanel.java~HEAD b/client/src/main/java/org/apache/hupa/client/ui/_ToolPanel.java~HEAD
deleted file mode 100644
index 6ef4f3c..0000000
--- a/client/src/main/java/org/apache/hupa/client/ui/_ToolPanel.java~HEAD
+++ /dev/null
@@ -1,99 +0,0 @@
-/****************************************************************
- * 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.client.ui;
-
-import com.google.gwt.core.client.GWT;
-import com.google.gwt.uibinder.client.UiBinder;
-import com.google.gwt.uibinder.client.UiField;
-import com.google.gwt.user.client.ui.AcceptsOneWidget;
-import com.google.gwt.user.client.ui.Composite;
-import com.google.gwt.user.client.ui.DockLayoutPanel;
-import com.google.gwt.user.client.ui.IsWidget;
-import com.google.gwt.user.client.ui.SimplePanel;
-import com.google.gwt.user.client.ui.Widget;
-
-public class _ToolPanel extends Composite {
-
-	@UiField protected DockLayoutPanel thisPanel;
-	@UiField protected SimplePanel toolBarContainer;
-	@UiField protected SimplePanel composeToolBarContainer;
-	@UiField protected SimplePanel searchBoxContainer;
-
-	public _ToolPanel() {
-		initWidget(binder.createAndBindUi(this));
-	}
-
-	void toggleTo(int layout) {
-		switch (layout) {
-		case HupaLayout.LAYOUT_MESSAGE:
-			this.toggleToCompose(false);break;
-		case HupaLayout.LAYOUT_COMPOSE:
-			this.toggleToCompose(true);break;
-			//TODO compose button should be shown when setting
-		default:
-			hideAll();
-		}
-	}
-
-	private void hideAll() {
-		toolBarContainer.setVisible(false);
-		searchBoxContainer.setVisible(false);
-		composeToolBarContainer.setVisible(false);
-	}
-
-	protected void toggleToCompose(boolean visible) {
-		toolBarContainer.setVisible(!visible);
-		searchBoxContainer.setVisible(!visible);
-		composeToolBarContainer.setVisible(visible);
-	}
-
-	public AcceptsOneWidget getToolBarView() {
-		return new AcceptsOneWidget() {
-			@Override
-			public void setWidget(IsWidget w) {
-				toolBarContainer.setWidget(Widget.asWidgetOrNull(w));
-			}
-		};
-	}
-
-	public AcceptsOneWidget getComposeToolBarView() {
-		return new AcceptsOneWidget() {
-			@Override
-			public void setWidget(IsWidget w) {
-				composeToolBarContainer.setWidget(Widget.asWidgetOrNull(w));
-			}
-		};
-	}
-
-	public AcceptsOneWidget getSearchBoxView() {
-		return new AcceptsOneWidget() {
-			@Override
-			public void setWidget(IsWidget w) {
-				searchBoxContainer.setWidget(Widget.asWidgetOrNull(w));
-			}
-		};
-	}
-
-	interface _ToolPanelUiBinder extends UiBinder<DockLayoutPanel, _ToolPanel> {
-	}
-
-	private static _ToolPanelUiBinder binder = GWT.create(_ToolPanelUiBinder.class);
-
-}
diff --git a/client/src/main/java/org/apache/hupa/client/ui/_ToolPanel.ui.xml~HEAD b/client/src/main/java/org/apache/hupa/client/ui/_ToolPanel.ui.xml~HEAD
deleted file mode 100644
index b6ebbb4..0000000
--- a/client/src/main/java/org/apache/hupa/client/ui/_ToolPanel.ui.xml~HEAD
+++ /dev/null
@@ -1,26 +0,0 @@
-<!-- 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. -->
-
-<ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder'
-	xmlns:g='urn:import:com.google.gwt.user.client.ui'>
-	<g:DockLayoutPanel unit="PX" ui:field="thisPanel">
-		<g:west size="518">
-			<g:SimplePanel ui:field="toolBarContainer" />
-		</g:west>
-		<g:center>
-			<g:SimplePanel ui:field="composeToolBarContainer" />
-		</g:center>
-		<g:east size="210">
-			<g:SimplePanel ui:field="searchBoxContainer">
-			</g:SimplePanel>
-		</g:east>
-	</g:DockLayoutPanel>
-</ui:UiBinder>
\ No newline at end of file
diff --git a/client/src/main/java/org/apache/hupa/client/ui/__ContentPanel.java~HEAD b/client/src/main/java/org/apache/hupa/client/ui/__ContentPanel.java~HEAD
deleted file mode 100644
index 55c4c2c..0000000
--- a/client/src/main/java/org/apache/hupa/client/ui/__ContentPanel.java~HEAD
+++ /dev/null
@@ -1,94 +0,0 @@
-/****************************************************************
- * 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.client.ui;
-
-import com.google.gwt.core.client.GWT;
-import com.google.gwt.uibinder.client.UiBinder;
-import com.google.gwt.uibinder.client.UiField;
-import com.google.gwt.user.client.ui.AcceptsOneWidget;
-import com.google.gwt.user.client.ui.Composite;
-import com.google.gwt.user.client.ui.DockLayoutPanel;
-import com.google.gwt.user.client.ui.HTMLPanel;
-import com.google.gwt.user.client.ui.IsWidget;
-import com.google.gwt.user.client.ui.SimpleLayoutPanel;
-import com.google.gwt.user.client.ui.SimplePanel;
-import com.google.gwt.user.client.ui.SplitLayoutPanel;
-import com.google.gwt.user.client.ui.Widget;
-
-public class __ContentPanel extends Composite{
-	@UiField SplitLayoutPanel thisPanel;
-	@UiField DockLayoutPanel messageListBox;
-	@UiField SimpleLayoutPanel messageListContainer;
-	@UiField SimplePanel messageListFooterContainer;
-	@UiField SimpleLayoutPanel messageContentContainer;
-	@UiField SimplePanel statusContainer;
-
-	@UiField HTMLPanel contactBox;
-
-	public __ContentPanel() {
-		initWidget(binder.createAndBindUi(this));
-		thisPanel.setWidgetHidden(contactBox, true);
-		thisPanel.setWidgetMinSize(messageListBox, 130);
-	}
-
-	public AcceptsOneWidget getMessageListView() {
-		return new AcceptsOneWidget() {
-			@Override
-			public void setWidget(IsWidget w) {
-				messageListContainer.setWidget(Widget.asWidgetOrNull(w));
-			}
-		};
-	}
-
-	public AcceptsOneWidget getMessageListFooterView() {
-		return new AcceptsOneWidget() {
-			@Override
-			public void setWidget(IsWidget w) {
-				messageListFooterContainer.setWidget(Widget.asWidgetOrNull(w));
-			}
-		};
-	}
-
-	public AcceptsOneWidget getMessageContentView() {
-		return new AcceptsOneWidget() {
-			@Override
-			public void setWidget(IsWidget w) {
-				messageContentContainer.setWidget(Widget.asWidgetOrNull(w));
-			}
-		};
-	}
-
-	public AcceptsOneWidget getStatusView() {
-		return new AcceptsOneWidget() {
-			@Override
-			public void setWidget(IsWidget w) {
-				statusContainer.setWidget(Widget.asWidgetOrNull(w));
-			}
-		};
-	}
-
-	interface __ContentPanelUiBinder extends
-			UiBinder<SplitLayoutPanel, __ContentPanel> {
-	}
-
-	private static __ContentPanelUiBinder binder = GWT
-			.create(__ContentPanelUiBinder.class);
-
-}
diff --git a/client/src/main/java/org/apache/hupa/client/ui/__ContentPanel.ui.xml~HEAD b/client/src/main/java/org/apache/hupa/client/ui/__ContentPanel.ui.xml~HEAD
deleted file mode 100644
index bf5d780..0000000
--- a/client/src/main/java/org/apache/hupa/client/ui/__ContentPanel.ui.xml~HEAD
+++ /dev/null
@@ -1,99 +0,0 @@
-<!-- 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. -->
-
-<ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder'
-	xmlns:g='urn:import:com.google.gwt.user.client.ui'>
-    <ui:image field="originLogo" src="res/hupa-logo-original-transparent.png" />
-	<ui:style>
-		.box {
-			border: 1px solid #A3A3A3;
-			border-radius: 4px;
-			overflow: hidden;
-			box-shadow: 0 0 2px #999;
-			-o-box-shadow: 0 0 2px #999;
-			-webkit-box-shadow: 0 0 2px #999;
-			-moz-box-shadow: 0 0 2px #999;
-			background: white;
-		}
-		
-		.messageListFooter {
-			position: absolute;
-			bottom: 0;
-			left: 0;
-			right: 0;
-			height: 22px;
-			padding: 4px 8px;
-			border-top: 1px solid #ddd;
-			background: #ebebeb;
-			background: -moz-linear-gradient(top, #ebebeb 0%, #c6c6c6 100%);
-			background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ebebeb),
-				color-stop(100%, #c6c6c6) );
-			background: -o-linear-gradient(top, #ebebeb 0%, #c6c6c6 100%);
-			background: -ms-linear-gradient(top, #ebebeb 0%, #c6c6c6 100%);
-			background: linear-gradient(top, #ebebeb 0%, #c6c6c6 100%);
-			border-radius: 0 0 4px 4px;
-		}
-		
-		@sprite .messageContent {
-			margin: 8px;
-			gwt-image: 'originLogo';
-			background-position: center center;
-			width: auto;
-			height: auto;
-			filter: grayscale(100%);
-			-webkit-filter: grayscale(100%);
-			-moz-filter: grayscale(100%);
-			-ms-filter: grayscale(100%);
-			-o-filter: grayscale(100%);
-			opacity: 0.7;
-		}
-		
-		@sprite .messageContentWorkAround {
-			margin: 8px 0 8px 8px;
-			padding-right: 8px;
-			gwt-image: 'originLogo';
-			background-position: center center;
-			width: auto;
-			height: auto;
-		}
-	</ui:style>
-	<g:SplitLayoutPanel ui:field="thisPanel">
-		<g:north size="200">
-			<g:DockLayoutPanel unit="PX" addStyleNames="{style.box}"
-				ui:field="messageListBox">
-				<g:center>
-					<g:SimpleLayoutPanel ui:field="messageListContainer" />
-				</g:center>
-				<g:south size="31">
-					<g:SimplePanel ui:field="messageListFooterContainer"
-						addStyleNames="{style.messageListFooter}" />
-				</g:south>
-			</g:DockLayoutPanel>
-		</g:north>
-		<g:west size="200">
-			<g:HTMLPanel ui:field="contactBox" addStyleNames="{style.box}">
-				Address
-			</g:HTMLPanel>
-		</g:west>
-		<g:center>
-			<g:DockLayoutPanel unit="PX" addStyleNames="{style.box}"
-				ui:field="messageContentBox">
-				<g:center>
-					<g:SimpleLayoutPanel ui:field="messageContentContainer"
-						addStyleNames="{style.messageContentWorkAround}" />
-				</g:center>
-				<g:south size="0">
-					<g:SimplePanel ui:field="statusContainer" />
-				</g:south>
-			</g:DockLayoutPanel>
-		</g:center>
-	</g:SplitLayoutPanel>
-</ui:UiBinder>
\ No newline at end of file