You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ma...@apache.org on 2013/09/23 09:04:13 UTC
svn commit: r1525515 [8/13] - in /james/hupa/trunk: ./ client/
client/src/main/java/org/apache/hupa/
client/src/main/java/org/apache/hupa/client/
client/src/main/java/org/apache/hupa/client/activity/
client/src/main/java/org/apache/hupa/client/ioc/ cli...
Modified: james/hupa/trunk/client/src/main/webapp/styles.css
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/webapp/styles.css?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/webapp/styles.css (original)
+++ james/hupa/trunk/client/src/main/webapp/styles.css Mon Sep 23 07:04:08 2013
@@ -2,15 +2,7 @@
* Roundcube webmail styles for skin "Larry"
*
* Copyright (c) 2012, The Roundcube Dev Team
-<<<<<<< HEAD
-<<<<<<< HEAD
* Screendesign by FLINT / B�ro f�r Gestaltung, bueroflint.com
-=======
- * Screendesign by FLINT / Bro fr Gestaltung, bueroflint.com
->>>>>>> refactoring theme 1 - login page
-=======
- * Screendesign by FLINT / B�ro f�r Gestaltung, bueroflint.com
->>>>>>> make delete label in label setting work(backend now)
*
* The contents are subject to the Creative Commons Attribution-ShareAlike
* License. It is allowed to copy, distribute, transmit and to adapt the work
@@ -19,8 +11,6 @@
*
* $Id$
*/
-<<<<<<< HEAD
-<<<<<<< HEAD
body {
font-family: "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
font-size: 11px;
@@ -2162,14 +2152,6 @@ fieldset.tab {
color: #0d0eb0;
text-decoration: underline;
cursor: pointer;
-<<<<<<< HEAD
-}.hupa-attachment .hupa-hyperlink {
- padding-left: 5px;
- color: #0d0eb0;
- text-decoration: underline;
- cursor: pointer;
-=======
->>>>>>> fixed issue#73, using LinkedHashSet in memory to store the contacts list like 'Echo Wang <ec...@gmail.com>'
}
@@ -2273,10 +2255,6 @@ fieldset.tab {
width: 0px;
height: 0px;
overflow: hidden;
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> make a skeleton in the setting place, for more setting items
}
@@ -2503,2177 +2481,4 @@ fieldset.tab {
.webkit #pluginlist td.license,
.webkit #pluginlist td.source {
width: 9em;
-<<<<<<< HEAD
-=======
-
-=======
->>>>>>> beautify the multiuploader
-body {
- font-family: "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
- font-size: 11px;
- color: #333;
- background: url(images/linen.jpg) repeat #d1d5d8;
- margin: 0;
-}
-
-body.noscroll { /* also avoids bounce effect in Chrome and Safari */
- overflow: hidden;
-}
-
-a {
- color: #0069a6;
-}
-
-a:visited {
- color: #0186ba;
-}
-
-img {
- border: 0;
-}
-
-input[type="text"],input[type="password"],textarea {
- margin: 0; /* Safari by default adds a margin */
- padding: 4px;
- border: 1px solid #b2b2b2;
- border-radius: 4px;
- box-shadow: inset 0 0 2px 1px rgba(0, 0, 0, 0.1);
- -moz-box-shadow: inset 0 0 2px 1px rgba(0, 0, 0, 0.1);
- -webkit-box-shadow: inset 0 0 2px 1px rgba(0, 0, 0, 0.1);
- -o-box-shadow: inset 0 0 2px 1px rgba(0, 0, 0, 0.1);
-}
-
-input[type="text"]:focus,input[type="password"]:focus,input.button:focus,textarea:focus
- {
- border-color: #4787b1;
- box-shadow: 0 0 5px 2px rgba(71, 135, 177, 0.9);
- -moz-box-shadow: 0 0 5px 2px rgba(71, 135, 177, 0.9);
- -webkit-box-shadow: 0 0 5px 2px rgba(71, 135, 177, 0.9);
- -o-box-shadow: 0 0 5px 2px rgba(71, 135, 177, 0.9);
- outline: none;
-}
-
-input.placeholder,textarea.placeholder {
- color: #aaa;
-}
-
-.bold {
- font-weight: bold;
-}
-
-/*** buttons ***/
-input.button {
- display: inline-block;
- margin: 0 2px;
- padding: 2px 5px;
- color: #525252;
- text-shadow: 0px 1px 1px #fff;
- border: 1px solid #c0c0c0;
- border-radius: 4px;
- background: #f7f7f7;
- background: -moz-linear-gradient(top, #f9f9f9 0%, #e6e6e6 100%);
- background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #f9f9f9),
- color-stop(100%, #e6e6e6) );
- background: -o-linear-gradient(top, #f9f9f9 0%, #e6e6e6 100%);
- background: -ms-linear-gradient(top, #f9f9f9 0%, #e6e6e6 100%);
- background: linear-gradient(top, #f9f9f9 0%, #e6e6e6 100%);
- box-shadow: 0 1px 1px 0 rgba(140, 140, 140, 0.3);
- -o-box-shadow: 0 1px 1px 0 rgba(140, 140, 140, 0.3);
- -webkit-box-shadow: 0 1px 1px 0 rgba(140, 140, 140, 0.3);
- -moz-box-shadow: 0 1px 1px 0 rgba(140, 140, 140, 0.3);
- text-decoration: none;
- outline: none;
-}
-
-.formbuttons input.button {
- color: #ddd;
- font-size: 110%;
- text-shadow: 0px 1px 1px #333;
- padding: 4px 12px;
- border-color: #465864;
- border-radius: 5px;
- background: #7a7b7d;
- background: -moz-linear-gradient(top, #7b7b7b 0%, #606060 100%);
- /* FF3.6+ */
- background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #7b7b7b),
- color-stop(100%, #606060) ); /* Chrome,Safari4+ */
- background: -o-linear-gradient(top, #7b7b7b 0%, #606060 100%);
- /* Opera 11.10+ */
- background: -ms-linear-gradient(top, #7b7b7b 0%, #606060 100%);
- /* IE10+ */
- background: linear-gradient(top, #7b7b7b 0%, #606060 100%); /* W3C */
- box-shadow: 0 1px 1px 0 #ccc, inset 0 1px 0 0 #888;
- -o-box-shadow: 0 1px 1px 0 #ccc, inset 0 1px 0 0 #888;
- -webkit-box-shadow: 0 1px 1px 0 #ccc, inset 0 1px 0 0 #888;
- -moz-box-shadow: 0 1px 1px 0 #ccc, inset 0 1px 0 0 #888;
-}
-
-.formbuttons input.button:hover,.formbuttons input.button:focus,input.button.mainaction:hover,input.button.mainaction:focus
- {
- color: #f2f2f2;
- border-color: #465864;
- box-shadow: 0 0 5px 2px rgba(71, 135, 177, 0.6), inset 0 1px 0 0 #888;
- -moz-box-shadow: 0 0 5px 2px rgba(71, 135, 177, 0.6), inset 0 1px 0 0
- #888;
- -webkit-box-shadow: 0 0 5px 2px rgba(71, 135, 177, 0.6), inset 0 1px 0 0
- #888;
- -o-box-shadow: 0 0 5px 2px rgba(71, 135, 177, 0.6), inset 0 1px 0 0 #888;
-}
-
-.formbuttons input.button:active {
- color: #fff;
- background: -moz-linear-gradient(top, #5c5c5c 0%, #7b7b7b 100%);
- background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #5c5c5c),
- color-stop(100%, #7b7b7b) );
- background: -o-linear-gradient(top, #5c5c5c 0%, #7b7b7b 100%);
- background: -ms-linear-gradient(top, #5c5c5c 0%, #7b7b7b 100%);
- background: linear-gradient(top, #5c5c5c 0%, #7b7b7b 100%);
-}
-
-input.button.mainaction {
- color: #ededed;
- text-shadow: 0px 1px 1px #333;
- border-color: #1f262c;
- background: #505050;
- background: -moz-linear-gradient(top, #505050 0%, #2a2e31 100%);
- background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #505050),
- color-stop(100%, #2a2e31) );
- background: -o-linear-gradient(top, #505050 0%, #2a2e31 100%);
- background: -ms-linear-gradient(top, #505050 0%, #2a2e31 100%);
- background: linear-gradient(top, #505050 0%, #2a2e31 100%);
- box-shadow: inset 0 1px 0 0 #777;
- -moz-box-shadow: inset 0 1px 0 0 #777;
- -webkit-box-shadow: inset 0 1px 0 0 #777;
- -o-box-shadow: inset 0 1px 0 0 #777;
-}
-
-input.button.mainaction:active {
- color: #fff;
- background: #515151;
- background: -moz-linear-gradient(top, #2a2e31 0%, #505050 100%);
- background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #2a2e31),
- color-stop(100%, #505050) );
- background: -o-linear-gradient(top, #2a2e31 0%, #505050 100%);
- background: -ms-linear-gradient(top, #2a2e31 0%, #505050 100%);
- background: linear-gradient(top, #2a2e31 0%, #505050 100%);
-}
-
-input.button[disabled],input.button[disabled]:hover,input.button.mainaction[disabled]
- {
- color: #aaa !important;
-}
-
-input.mainaction {
- font-weight: bold;
-}
-
-/** link buttons **/
-a.button {
- display: inline-block;
- margin: 0 2px;
- padding: 2px 5px;
- color: #525252;
- text-shadow: 0px 1px 1px #fff;
- border: 1px solid #c6c6c6;
- border-radius: 4px;
- background: #f7f7f7;
- background: -moz-linear-gradient(top, #f9f9f9 0%, #e6e6e6 100%);
- background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #f9f9f9),
- color-stop(100%, #e6e6e6) );
- background: -o-linear-gradient(top, #f9f9f9 0%, #e6e6e6 100%);
- background: -ms-linear-gradient(top, #f9f9f9 0%, #e6e6e6 100%);
- background: linear-gradient(top, #f9f9f9 0%, #e6e6e6 100%);
- box-shadow: 0 1px 1px 0 rgba(140, 140, 140, 0.3);
- -o-box-shadow: 0 1px 1px 0 rgba(140, 140, 140, 0.3);
- -webkit-box-shadow: 0 1px 1px 0 rgba(140, 140, 140, 0.3);
- -moz-box-shadow: 0 1px 1px 0 rgba(140, 140, 140, 0.3);
- text-decoration: none;
-}
-
-a.button:focus,input.button:focus {
- border-color: #4fadd5;
- box-shadow: 0 0 2px 1px rgba(71, 135, 177, 0.6);
- -moz-box-shadow: 0 0 2px 1px rgba(71, 135, 177, 0.6);
- -webkit-box-shadow: 0 0 2px 1px rgba(71, 135, 177, 0.6);
- -o-box-shadow: 0 0 2px 1px rgba(71, 135, 177, 0.6);
- outline: none;
-}
-
-label.disabled,a.button.disabled {
- color: #999;
-}
-
-a.button.disabled,input.button.disabled,input.button[disabled],a.button.disabled:hover,input.button.disabled:hover,input.button[disabled]:hover
- {
- border-color: #c6c6c6;
- box-shadow: 0 1px 1px 0 rgba(160, 160, 160, 0.4);
- -o-box-shadow: 0 1px 1px 0 rgba(160, 160, 160, 0.4);
- -webkit-box-shadow: 0 1px 1px 0 rgba(160, 160, 160, 0.4);
- -moz-box-shadow: 0 1px 1px 0 rgba(160, 160, 160, 0.4);
-}
-
-a.button.disabled span.inner {
- opacity: 0.4;
- filter: alpha(opacity = 40);
-}
-
-a.button.pressed,a.button:active,input.button:active {
- background: #e6e6e6;
- background: -moz-linear-gradient(top, #e6e6e6 0%, #f9f9f9 100%);
- background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #e6e6e6),
- color-stop(100%, #f9f9f9) );
- background: -o-linear-gradient(top, #e6e6e6 0%, #f9f9f9 100%);
- background: -ms-linear-gradient(top, #e6e6e6 0%, #f9f9f9 100%);
- background: linear-gradient(top, #e6e6e6 0%, #f9f9f9 100%);
-}
-
-.pagenav.dark a.button {
- font-weight: bold;
- border-color: #e6e6e6;
- background: #d8d8d8;
- background: -moz-linear-gradient(top, #d8d8d8 0%, #bababa 100%);
- background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #d8d8d8),
- color-stop(100%, #bababa) );
- background: -o-linear-gradient(top, #d8d8d8 0%, #bababa 100%);
- background: -ms-linear-gradient(top, #d8d8d8 0%, #bababa 100%);
- background: linear-gradient(top, #d8d8d8 0%, #bababa 100%);
- box-shadow: 0 1px 1px 0 #999;
- -o-box-shadow: 0 1px 1px 0 #999;
- -webkit-box-shadow: 0 1px 1px 0 #999;
- -moz-box-shadow: 0 1px 1px 0 #999;
-}
-
-.pagenav.dark a.button.pressed {
- background: #bababa;
- background: -moz-linear-gradient(top, #bababa 0%, #d8d8d8 100%);
- background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #bababa),
- color-stop(100%, #d8d8d8) );
- background: -o-linear-gradient(top, #bababa 0%, #d8d8d8 100%);
- background: -ms-linear-gradient(top, #bababa 0%, #d8d8d8 100%);
- background: linear-gradient(top, #bababa 0%, #d8d8d8 100%);
-}
-
-.pagenav a.button {
- padding: 1px 3px;
- height: 16px;
- vertical-align: middle;
- margin-bottom: 1px;
-}
-
-.pagenav a.button span.inner {
- display: inline-block;
- width: 16px;
- height: 13px;
- text-indent: 1000px;
- overflow: hidden;
- background: url(images/buttons.png) -6px -211px no-repeat;
-}
-
-.pagenav a.prevpage span.inner {
- background-position: -7px -226px;
-}
-
-.pagenav a.nextpage span.inner {
- background-position: -28px -226px;
-}
-
-.pagenav a.lastpage span.inner {
- background-position: -28px -211px;
-}
-
-.pagenav a.pageup span.inner {
- background-position: -7px -241px;
-}
-
-.pagenav a.pagedown span.inner {
- background-position: -29px -241px;
-}
-
-.pagenav a.reply span.inner {
- background-position: -7px -256px;
-}
-
-.pagenav a.forward span.inner {
- background-position: -29px -256px;
-}
-
-.pagenav a.replyall span.inner {
- background-position: -7px -271px;
-}
-
-.pagenav a.extwin span.inner {
- background-position: -29px -271px;
-}
-
-.pagenav .countdisplay {
- display: inline-block;
- padding: 3px 1em 0 1em;
- text-shadow: 0px 1px 1px #fff;
- min-width: 16em;
-}
-
-.pagenavbuttons {
- position: relative;
- top: -2px;
-}
-
-a.iconbutton {
- display: inline-block;
- width: 24px;
- height: 18px;
- text-decoration: none;
- text-indent: -5000px;
- background: url(images/buttons.png) -1000px 0 no-repeat;
-}
-
-a.iconbutton.disabled {
- opacity: 0.4;
- filter: alpha(opacity = 40);
- cursor: default;
-}
-
-a.iconbutton.searchoptions {
- background-position: -2px -317px;
-}
-
-a.iconbutton.reset {
- background-position: -25px -317px;
-}
-
-a.iconbutton.cancel {
- background-position: -7px -377px;
-}
-
-a.iconlink {
- display: inline-block;
- color: #888;
- text-decoration: none;
- white-space: nowrap;
- padding: 2px 8px 2px 20px;
- background: url(images/buttons.png) -1000px 0 no-repeat;
-}
-
-a.iconlink:hover {
- text-decoration: underline;
-}
-
-a.iconlink.delete {
- background-position: -7px -337px;
-}
-
-a.iconlink.add {
- background-position: -7px -357px;
-}
-
-a.iconlink.remove {
- background-position: -7px -378px;
-}
-
-a.iconlink.cancel {
- background-position: -7px -397px;
-}
-
-a.iconlink.edit {
- background-position: -7px -417px;
-}
-
-a.iconlink.upload {
- background-position: -6px -437px;
-}
-
-/*** message bar ***/
-#message div.loading,#message div.warning,#message div.error,#message div.notice,#message div.confirmation,#message-objects div.notice
- {
- color: #555;
- font-weight: bold;
- padding: 6px 30px 6px 25px;
- display: inline-block;
- white-space: nowrap;
- background: url(images/messages.png) 0 5px no-repeat;
- cursor: default;
-}
-
-#message div.warning {
- color: #960;
- background-position: 0 -86px;
-}
-
-#message div.error {
- color: #cf2734;
- background-position: 0 -55px;
-}
-
-#message div.confirmation {
- color: #093;
- background-position: 0 -25px;
-}
-
-#message div.loading {
- background: url(images/ajaxloader.gif) 2px 6px no-repeat;
-}
-
-#message div a,#message div span {
- padding-right: 0.5em;
- text-decoration: none;
-}
-
-#message div a:hover {
- text-decoration: underline;
- cursor: pointer;
-}
-
-#message.statusbar {
- position: absolute;
- bottom: 0;
- left: 0;
- right: 0;
- height: 27px;
- padding-left: 8px;
- border-top: 1px solid #ddd;
- border-radius: 0 0 4px 4px;
- background: #eaeaea;
- background: -moz-linear-gradient(top, #eaeaea 0%, #c8c8c8 100%);
- background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #eaeaea),
- color-stop(100%, #c8c8c8) );
- background: -o-linear-gradient(top, #eaeaea 0%, #c8c8c8 100%);
- background: -ms-linear-gradient(top, #eaeaea 0%, #c8c8c8 100%);
- background: linear-gradient(top, #eaeaea 0%, #c8c8c8 100%);
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
-}
-
-.ui-dialog.error .ui-dialog-title,.ui-dialog.warning .ui-dialog-title,.ui-dialog.confirmation .ui-dialog-title
- {
- padding-left: 25px;
- background: url(images/messages.png) 0 5px no-repeat;
- text-shadow: 0 1px 1px #fff;
-}
-
-.ui-dialog.warning .ui-dialog-title {
- color: #960;
- background-position: 0 -90px;
-}
-
-.ui-dialog.error .ui-dialog-title {
- color: #cf2734;
- background-position: 0 -60px;
-}
-
-.ui-dialog.confirmation .ui-dialog-title {
- color: #093;
- background-position: 0 -30px;
-}
-
-.ui-dialog.popupmessage .ui-dialog-titlebar {
- padding: 8px 1em 4px 1em;
- background: #e3e3e3;
- background: -moz-linear-gradient(top, #e3e3e3 0%, #cfcfcf 100%);
- background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #e3e3e3),
- color-stop(100%, #cfcfcf) );
- background: -o-linear-gradient(top, #e3e3e3 0%, #cfcfcf 100%);
- background: -ms-linear-gradient(top, #e3e3e3 0%, #cfcfcf 100%);
- background: linear-gradient(top, #e3e3e3 0%, #cfcfcf 100%);
-}
-
-.ui-dialog.popupmessage .ui-widget-content {
- font-size: 12px;
- background: #eee;
- background: -moz-linear-gradient(top, #eee 0%, #dcdcdc 100%);
- background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #eee),
- color-stop(100%, #dcdcdc) );
- background: -o-linear-gradient(top, #eee 0%, #dcdcdc 100%);
- background: -ms-linear-gradient(top, #eee 0%, #dcdcdc 100%);
- background: linear-gradient(top, #eee 0%, #dcdcdc 100%);
-}
-
-/*** basic page layout ***/
-#topline {
- height: 18px;
- background: url(images/linen_header.jpg) repeat #666;
- border-bottom: 1px solid #4f4f4f;
- padding: 2px 0 2px 10px;
- color: #aaa;
-}
-
-#topnav {
- height: 46px;
- margin-bottom: 10px;
- padding: 0 0 0 10px;
- background: #111;
- background: -moz-linear-gradient(top, #404040 0%, #060606 100%);
- background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #404040),
- color-stop(100%, #060606) );
- background: -o-linear-gradient(top, #404040 0%, #060606 100%);
- background: -ms-linear-gradient(top, #404040 0%, #060606 100%);
- background: linear-gradient(top, #404040 0%, #060606 100%);
-}
-
-#topline a,#topnav a {
- color: #eee;
- text-decoration: none;
-}
-
-#topline a:hover {
- text-decoration: underline;
-}
-
-#toplogo {
- padding-top: 2px;
-}
-
-.topleft {
- float: left;
-}
-
-.topright {
- float: right;
-}
-
-.closelink {
- display: inline-block;
- padding: 2px 10px 2px 20px;
-}
-
-#topline span.username {
- padding-right: 1em;
-}
-
-#topline .topleft a {
- display: inline-block;
- padding: 2px 0.8em 0 0;
- color: #aaa;
-}
-
-#topline a.button-logout {
- display: inline-block;
- padding: 2px 10px 2px 20px;
- background: url(images/buttons.png) -6px -193px no-repeat;
- color: #fff;
-}
-
-/*** taskbar ***/
-#taskbar a {
- display: inline-block;
- height: 34px;
- padding: 12px 10px 0 6px;
-}
-
-#taskbar a span.button-inner {
- display: inline-block;
- font-size: 110%;
- font-weight: normal;
- text-shadow: 0px 1px 1px black;
- padding: 5px 0 0 34px;
- height: 19px;
- background: url(images/buttons.png) -1000px 0 no-repeat;
-}
-
-#taskbar a.button-selected {
- color: #3cf;
- background-color: #2c2c2c;
-}
-
-#taskbar a.button-mail span.button-inner {
- background-position: 0 2px;
-}
-
-#taskbar a.button-mail:hover span.button-inner,#taskbar a.button-mail.button-selected span.button-inner
- {
- background-position: 0 -22px;
-}
-
-#taskbar a.button-addressbook span.button-inner {
- background-position: 0 -48px;
-}
-
-#taskbar a.button-addressbook:hover span.button-inner,#taskbar a.button-addressbook.button-selected span.button-inner
- {
- background-position: 0 -72px;
-}
-
-#taskbar a.button-settings span.button-inner {
- background-position: 0 -96px;
-}
-
-#taskbar a.button-settings:hover span.button-inner,#taskbar a.button-settings.button-selected span.button-inner
- {
- background-position: 0 -120px;
-}
-
-#taskbar a.button-calendar span.button-inner {
- background-position: 0 -144px;
-}
-
-#taskbar a.button-calendar:hover span.button-inner,#taskbar a.button-calendar.button-selected span.button-inner
- {
- background-position: 0 -168px;
-}
-
-#mainscreen {
- position: absolute;
- top: 88px;
- left: 10px;
- right: 10px;
- bottom: 20px;
-}
-
-#mainscreen.offset {
- top: 130px;
-}
-
-#mainscreen .offset {
- margin-top: 42px;
-}
-
-.uibox {
- 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: #fff;
-}
-
-.minwidth {
- position: absolute;
- top: 0;
- left: 0;
- bottom: 0;
- width: 100%;
- min-width: 1150px;
-}
-
-.scroller {
- overflow: auto;
-}
-
-.readtext {
- width: 42em;
- padding: 12px;
- font-size: 12px;
-}
-
-.readtext>h1,.readtext>h2,.readtext>h3 {
- margin-top: 0;
-}
-
-.watermark {
- background-image: url(images/watermark.jpg);
- background-position: center;
- background-repeat: no-repeat;
-}
-
-/*** lists ***/
-.listbox {
- background: #d9ecf4;
- overflow: hidden;
-}
-
-.listbox .scroller {
- position: absolute;
- top: 0;
- left: 0;
- width: 100%;
- bottom: 0;
- overflow-x: hidden;
- overflow-y: auto;
-}
-
-.listbox .scroller.withfooter {
- bottom: 42px;
-}
-
-.listbox .boxtitle+.scroller {
- top: 34px;
-}
-
-.boxtitle,.uibox .listing thead td {
- font-size: 12px;
- font-weight: bold;
- padding: 10px 8px 3px 8px;
- height: 20px; /* doesn't affect table-cells in FF */
- margin: 0;
- text-shadow: 0px 1px 1px #fff;
- border-bottom: 1px solid #bbd3da;
- white-space: nowrap;
-}
-
-.uibox .listing thead td {
- padding-bottom: 8px;
- height: auto;
-}
-
-.uibox .boxtitle,.uibox .listing thead td {
- background: #b0ccd7;
- color: #004458;
- border-radius: 4px 4px 0 0;
-}
-
-.listbox .listitem,.listbox .tablink,.listing tbody td,.listing li {
- display: block;
- border-top: 1px solid #fff;
- border-bottom: 1px solid #bbd3da;
- cursor: default;
- font-weight: normal;
-}
-
-.listbox .listitem a,.listbox .tablink a,.listing tbody td,.listing li a
- {
- display: block;
- color: #376572;
- text-shadow: 0px 1px 1px #fff;
- text-decoration: none;
- cursor: default;
- padding: 6px 8px 2px 8px;
- height: 17px; /* doesn't affect table-cells in FF */
- white-space: nowrap;
-}
-
-.listing tbody td {
- display: table-cell;
- padding-bottom: 5px;
- height: auto;
- min-height: 14px;
-}
-
-.webkit .listing tbody td {
- height: 14px;
-}
-
-.listbox .listitem.selected,.listbox .tablink.selected,.listbox .listitem.selected>a,.listbox .tablink.selected>a,.listing tbody tr.unfocused td,.listing tbody tr.selected td,.listing li.selected,.listing li.selected>a
- {
- color: #004458;
- font-weight: bold;
- background-color: #c7e3ef;
-}
-
-ul.listing {
- display: block;
- list-style: none;
- margin: 0;
- padding: 0;
-}
-
-ul.listing li {
- background-color: #d9ecf4;
-}
-
-ul.listing li.droptarget,table.listing tr.droptarget td {
- background-color: #e8e798;
-}
-
-table.listing,table.layout {
- border: 0;
- width: 100%;
- border-spacing: 0;
-}
-
-table.layout td {
- vertical-align: top;
-}
-
-.listbox .boxfooter {
- position: absolute;
- bottom: 0;
- left: 0;
- width: 100%;
- height: 42px;
- border-top: 1px solid #ccdde4;
- background: #d9ecf4;
- -webkit-box-shadow: inset 0 1px 0 0 #fff;
- -moz-box-shadow: inset 0 1px 0 0 #fff;
- box-shadow: inset 0 1px 0 0 #fff;
- white-space: nowrap;
- overflow: hidden;
-}
-
-.uibox .boxfooter {
- border-radius: 0 0 4px 4px;
-}
-
-.boxfooter .listbutton {
- display: inline-block;
- text-decoration: none;
- width: 48px;
- border-right: 1px solid #fff;
- background: #c7e3ef;
- padding: 3px 0;
- margin-top: 1px;
-}
-
-.uibox .boxfooter .listbutton:first-child {
- border-radius: 0 0 0 4px;
-}
-
-.boxfooter .listbutton .inner {
- display: inline-block;
- width: 48px;
- height: 35px;
- text-indent: -5000px;
- background: url(images/buttons.png) -1000px 0 no-repeat;
-}
-
-.boxfooter .listbutton.add .inner {
- background-position: 10px -1301px;
-}
-
-.boxfooter .listbutton.delete .inner {
- background-position: 10px -1342px;
-}
-
-.boxfooter .listbutton.groupactions .inner {
- background-position: 5px -1382px;
-}
-
-.boxfooter .listbutton.addto .inner {
- background-position: 5px -1422px;
-}
-
-.boxfooter .listbutton.addcc .inner {
- background-position: 5px -1462px;
-}
-
-.boxfooter .listbutton.addbcc {
- width: 54px;
-}
-
-.boxfooter .listbutton.addbcc .inner {
- width: 54px;
- background-position: 2px -1502px;
-}
-
-.boxfooter .listbutton.removegroup .inner {
- background-position: 5px -1540px;
-}
-
-.boxfooter .listbutton.disabled .inner {
- opacity: 0.4;
- filter: alpha(opacity = 40);
-}
-
-.boxfooter .countdisplay {
- display: inline-block;
- position: relative;
- top: 10px;
- color: #69929e;
- padding: 3px 6px;
-}
-
-.boxpagenav {
- position: absolute;
- top: 10px;
- right: 6px;
- width: auto;
-}
-
-.boxpagenav a.icon {
- display: inline-block;
- padding: 1px 3px;
- height: 13px;
- width: 14px;
- text-indent: 1000px;
- vertical-align: bottom;
- overflow: hidden;
- background: url(images/buttons.png) -4px -286px no-repeat;
-}
-
-.boxpagenav a.icon.prevpage {
- background-position: -4px -301px;
-}
-
-.boxpagenav a.icon.nextpage {
- background-position: -28px -301px;
-}
-
-.boxpagenav a.icon.lastpage {
- background-position: -28px -286px;
-}
-
-.boxpagenav a.icon.disabled {
- opacity: 0.4;
- filter: alpha(opacity = 40);
-}
-
-.centerbox {
- width: 40em;
- margin: 16px auto;
-}
-
-.errorbox {
- width: 40em;
- padding: 20px;
-}
-
-.errorbox h3 {
- font-size: 16px;
- margin-top: 0;
-}
-
-/*** Records table ***/
-table.records-table {
- display: table;
- width: 100%;
- table-layout: fixed;
- border-collapse: collapse;
- border-spacing: 0;
- border: 1px solid #bbd3da;
-}
-
-.boxlistcontent .records-table {
- border: 0;
-}
-
-.records-table thead td {
- color: #69939e;
- font-size: 11px;
- font-weight: bold;
- background: #d6eaf3;
- background: -moz-linear-gradient(left, #e3f2f6 0, #d6eaf3 14px, #d6eaf3 100%);
- background: -webkit-gradient(linear, left top, right top, color-stop(0, #e3f2f6),
- color-stop(8%, #d6eaf3), color-stop(100%, #d6eaf3) );
- background: -o-linear-gradient(left, #e3f2f6 0, #d6eaf3 14px, #d6eaf3 100%);
- background: -ms-linear-gradient(left, #e3f2f6 0, #d6eaf3 14px, #d6eaf3 100%);
- background: linear-gradient(left, #e3f2f6 0, #d6eaf3 14px, #d6eaf3 100%);
- border-left: 1px solid #bbd3da;
- padding: 8px 7px;
- overflow: hidden;
- text-overflow: ellipsis;
-}
-
-.records-table.sortheader thead td {
- padding: 0;
-}
-
-.records-table thead td a,.records-table thead td span {
- display: block;
- padding: 7px 7px;
- color: #69939e;
- text-decoration: none;
- overflow: hidden;
- text-overflow: ellipsis;
-}
-
-.records-table tbody td {
- padding: 2px 7px;
- border-bottom: 1px solid #ddd;
- border-left: 1px dotted #bbd3da;
- white-space: nowrap;
- cursor: default;
- overflow: hidden;
- text-overflow: ellipsis;
- background-color: #fff;
-}
-
-.records-table thead tr td:first-child,.records-table tbody tr td:first-child
- {
- border-left: 0;
-}
-
-.records-table tr.selected td {
- color: #fff !important;
- background: #019bc6;
- background: -moz-linear-gradient(top, #019bc6 0%, #017cb4 100%);
- background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #019bc6),
- color-stop(100%, #017cb4) );
- background: -o-linear-gradient(top, #019bc6 0%, #017cb4 100%);
- background: -ms-linear-gradient(top, #019bc6 0%, #017cb4 100%);
- background: linear-gradient(top, #019bc6 0%, #017cb4 100%);
-}
-
-.records-table tr.selected td a,.records-table tr.selected td span {
- color: #fff !important;
-}
-
-.records-table tr.unfocused td {
- color: #fff !important;
- background: #4db0d2 !important;
-}
-
-.records-table tr.unfocused td a,.records-table tr.unfocused td span {
- color: #fff !important;
-}
-
-.records-table tr.deleted td,.records-table tr.deleted td a {
- color: #ccc !important;
-}
-
-/*** iFrames ***/
-#aboutframe {
- width: 97%;
- height: 100%;
- border: 0;
- padding: 0;
-}
-
-body.iframe {
- background: #fff;
- margin: 38px 0 10px 0;
-}
-
-body.iframe.floatingbuttons {
- margin-bottom: 40px;
-}
-
-body.iframe.fullheight {
- margin: 0;
-}
-
-.contentbox .boxtitle,body.iframe .boxtitle {
- color: #777;
- background: #eee;
- background: -moz-linear-gradient(top, #eee 0%, #dfdfdf 100%);
- background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #eee),
- color-stop(100%, #dfdfdf) );
- background: -o-linear-gradient(top, #eee 0%, #dfdfdf 100%);
- background: -ms-linear-gradient(top, #eee 0%, #dfdfdf 100%);
- background: linear-gradient(top, #eee 0%, #dfdfdf 100%);
- border-bottom: 1px solid #ccc;
-}
-
-body.iframe .boxtitle {
- position: fixed;
- top: 0;
- left: 0;
- width: 100%;
- z-index: 100;
-}
-
-body.iframe .footerleft.floating {
- position: fixed;
- left: 0;
- bottom: 0;
- width: 100%;
- z-index: 110;
- background: #fff;
- padding-top: 8px;
- padding-bottom: 12px;
-}
-
-body.iframe .footerleft.floating:before {
- content: " ";
- position: absolute;
- top: -6px;
- left: 0;
- width: 100%;
- height: 6px;
- background: url(images/overflowshadow.png) top center no-repeat;
-}
-
-.boxcontent {
- padding: 10px;
-}
-
-.contentbox .scroller {
- position: absolute;
- top: 34px;
- left: 0;
- right: 0;
- bottom: 28px;
- overflow: auto;
-}
-
-.iframebox {
- position: absolute;
- top: 0;
- left: 0;
- right: 0;
- bottom: 28px;
-}
-
-.footerleft {
- padding: 0 12px 4px 12px;
-}
-
-.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.propform {
- width: 100%;
- border-spacing: 0;
- border-collapse: collapse;
-}
-
-ul.proplist li,table.propform td {
- width: 80%;
- padding: 4px 10px;
- background: #eee;
- border-bottom: 2px solid #fff;
-}
-
-table.propform td.title {
- width: 20%;
- color: #333;
- padding-right: 20px;
- white-space: nowrap;
-}
-
-table.propform .mceLayout td {
- padding: 0;
- border-bottom: 0;
-}
-
-ul.proplist {
- list-style: none;
- margin: 0;
- padding: 0;
-}
-
-ul.proplist li {
- width: auto;
-}
-
-#pluginbody {
- position: absolute;
- top: 0;
- left: 0;
- right: 0;
- bottom: 0;
-}
-
-/*** Login form ***/
-#login-form {
- position: relative;
- width: 580px;
- margin: 20ex auto 2ex auto;
-}
-
-#login-form .box-inner {
- width: 430px;
- background: url(images/linen_login.jpg) top left no-repeat #5c5c5c;
- margin: 0 50px;
- padding: 10px 24px 24px 24px;
- border: 1px solid #333;
- border-radius: 5px;
- box-shadow: inset 0 0 1px #ccc;
- -o-box-shadow: inset 0 0 1px #ccc;
- -webkit-box-shadow: inset 0 0 1px #ccc;
- -moz-box-shadow: inset 0 0 1px #ccc;
-}
-
-#login-form .box-bottom {
- background: url(images/login_shadow.png) top center no-repeat;
- margin-top: -3px;
- padding-top: 10px;
-}
-
-#login-form td.input {
- width: 80%;
- padding: 8px;
-}
-
-#login-form input[type="text"],#login-form input[type="password"] {
- width: 100%;
- border-color: #666;
-}
-
-#login-form input.button {
- color: #444;
- text-shadow: 0px 1px 1px #fff;
- border-color: #f9f9f9;
- background: #f9f9f9;
- background: -moz-linear-gradient(top, #f9f9f9 0%, #e2e2e2 100%);
- background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #f9f9f9),
- color-stop(100%, #e2e2e2) );
- background: -o-linear-gradient(top, #f9f9f9 0%, #e2e2e2 100%);
- background: -ms-linear-gradient(top, #f9f9f9 0%, #e2e2e2 100%);
- background: linear-gradient(top, #f9f9f9 0%, #e2e2e2 100%);
- box-shadow: inset 0 1px 0 0 #fff;
- -moz-box-shadow: inset 0 1px 0 0 #fff;
- -webkit-box-shadow: inset 0 1px 0 0 #fff;
- -o-box-shadow: inset 0 1px 0 0 #fff;
-}
-
-#login-form input.button:hover,#login-form input.button:focus {
- box-shadow: 0 0 5px 2px rgba(71, 135, 177, 0.9), inset 0 1px 0 0 #fff;
- -moz-box-shadow: 0 0 5px 2px rgba(71, 135, 177, 0.9), inset 0 1px 0 0
- #fff;
- -webkit-box-shadow: 0 0 5px 2px rgba(71, 135, 177, 0.9), inset 0 1px 0 0
- #fff;
- -o-box-shadow: 0 0 5px 2px rgba(71, 135, 177, 0.9), inset 0 1px 0 0 #fff;
-}
-
-#login-form input.button:active {
- color: #333;
- background: -moz-linear-gradient(top, #dcdcdc 0%, #f9f9f9 100%);
- background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #dcdcdc),
- color-stop(100%, #f9f9f9) );
- background: -o-linear-gradient(top, #dcdcdc 0%, #f9f9f9 100%);
- background: -ms-linear-gradient(top, #dcdcdc 0%, #f9f9f9 100%);
- background: linear-gradient(top, #dcdcdc 0%, #f9f9f9 100%);
-}
-
-#login-form form table {
- width: 98%;
-}
-
-#login-form td.title {
- width: 20%;
- white-space: nowrap;
- color: #cecece;
- text-shadow: 0px 1px 1px black;
- text-align: right;
- padding-right: 1em;
-}
-
-#login-form p.formbuttons {
- margin-top: 2em;
- text-align: center;
-}
-
-#login-form #logo {
- margin-bottom: 20px;
-}
-
-#login-form #message {
- min-height: 40px;
- padding: 5px 25px;
- text-align: center;
-}
-
-#login-form #message div {
- display: inline-block;
- padding-right: 0;
-}
-
-#bottomline {
- font-size: 90%;
- text-align: center;
- margin-top: 2em;
-}
-
-/*** quicksearch **/
-#quicksearchbar {
- position: absolute;
- right: 1px;
- top: 0;
- width: 240px;
-}
-
-#quicksearchbar input {
- width: 176px;
- margin: 0;
- margin-top: 7px;
- padding: 3px 30px 3px 34px;
- height: 18px;
- background: #f1f1f1;
- border-color: #ababab;
- font-weight: bold;
- font-size: 11px;
-}
-
-#quicksearchbar #searchmenulink {
- position: absolute;
- top: 12px;
- left: 6px;
-}
-
-#quicksearchbar #searchreset {
- position: absolute;
- top: 11px;
- right: 1px;
-}
-
-/*** toolbar ***/
-.toolbar .spacer {
- display: inline-block;
- width: 24px;
- height: 40px;
- padding: 0;
-}
-
-.toolbar a.button {
- text-align: center;
- font-size: 10px;
- color: #555;
- min-width: 50px;
- max-width: 75px;
- height: 13px;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
- padding: 28px 2px 0 2px;
- text-shadow: 0px 1px 1px #eee;
- box-shadow: none;
- -moz-box-shadow: none;
- -webkit-box-shadow: none;
- -o-box-shadow: none;
- background: url(images/buttons.png) -100px 0 no-repeat transparent;
- border: 0;
-}
-
-.toolbar a.button.disabled {
- opacity: 0.4;
- filter: alpha(opacity = 40);
-}
-
-.dropbutton {
- display: inline-block;
- position: relative;
-}
-
-.dropbutton .dropbuttontip {
- display: block;
- position: absolute;
- right: 0;
- top: 0;
- height: 42px;
- width: 18px;
- background: url(images/buttons.png) 0 -1255px no-repeat;
- cursor: pointer;
-}
-
-.dropbutton .dropbuttontip:hover {
- background-position: -26px -1255px;
-}
-
-.dropbutton a.button.disabled+.dropbuttontip {
- opacity: 0.5;
- filter: alpha(opacity = 50);
-}
-
-.dropbutton a.button.disabled+.dropbuttontip:hover {
- background-position: 0 -1255px;
-}
-
-.dropbutton a.button {
- margin-left: 0;
- padding-left: 0;
- margin-right: 0;
- padding-right: 0;
-}
-
-.toolbar a.button.back {
- background-position: 0 -1216px;
-}
-
-.toolbar a.button.checkmail {
- background-position: center -1176px;
-}
-
-.toolbar a.button.compose {
- background-position: center -530px;
-}
-
-.toolbar a.button.reply {
- background-position: center -570px;
-}
-
-.toolbar a.button.reply-all {
- min-width: 64px;
- background-position: left -610px;
-}
-
-.toolbar a.button.forward {
- min-width: 64px;
- background-position: left -650px;
-}
-
-.toolbar a.button.delete {
- background-position: center -690px;
-}
-
-.toolbar a.button.archive {
- background-position: center -730px;
-}
-
-.toolbar a.button.junk {
- background-position: center -770px;
-}
-
-.toolbar a.button.print {
- background-position: center -810px;
-}
-
-.toolbar a.button.markmessage {
- background-position: center -1094px;
-}
-
-.toolbar a.button.more {
- background-position: center -850px;
-}
-
-.toolbar a.button.attach {
- background-position: center -890px;
-}
-
-.toolbar a.button.spellcheck {
- min-width: 64px;
- background-position: left -930px;
-}
-
-.toolbar a.button.spellcheck.selected {
- background-position: left -1580px;
- color: #1978a1;
-}
-
-.toolbar a.button.insertsig {
- background-position: center -1135px;
-}
-
-.toolbar a.button.search {
- background-position: center -970px;
-}
-
-.toolbar a.button.import {
- background-position: center -1012px;
-}
-
-.toolbar a.button.export {
- background-position: center -1054px;
-}
-
-a.menuselector {
- display: inline-block;
- border: 1px solid #ababab;
- border-radius: 4px;
- background: #f8f8f8;
- background: -moz-linear-gradient(top, #f8f8f8 0%, #dddddd 100%);
- background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #f8f8f8),
- color-stop(100%, #dddddd) );
- background: -o-linear-gradient(top, #f8f8f8 0%, #dddddd 100%);
- background: -ms-linear-gradient(top, #f9f9f9 0%, #dddddd 100%);
- background: linear-gradient(top, #f8f8f8 0%, #dddddd 100%);
- text-decoration: none;
- color: #333;
- cursor: pointer;
- white-space: nowrap;
-}
-
-a.menuselector .handle {
- display: inline-block;
- padding: 0 32px 0 6px;
- height: 20px;
- line-height: 19px;
- text-shadow: 0px 1px 1px #fff;
- background: url(images/selector.png) right center no-repeat;
- border-radius: 4px;
-}
-
-a.menuselector:active {
- background: #dddddd;
- background: -moz-linear-gradient(top, #dddddd 0%, #f8f8f8 100%);
- background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #dddddd),
- color-stop(100%, #f8f8f8) );
- background: -o-linear-gradient(top, #dddddd 0%, #f8f8f8 100%);
- background: -ms-linear-gradient(top, #dddddd 0%, #f8f8f8 100%);
- background: linear-gradient(top, #dddddd 0%, #f8f8f8 100%);
- text-decoration: none;
-}
-
-select.decorated {
- position: relative;
- z-index: 10;
- opacity: 0;
- height: 22px;
- cursor: pointer;
- filter: alpha(opacity = 0);
- -khtml-appearance: none;
- -webkit-appearance: none;
-}
-
-html.opera select.decorated {
- opacity: 1;
-}
-
-select.decorated option {
- color: #fff;
- background: #444;
- border: 0;
- border-top: 1px solid #5a5a5a;
- border-bottom: 1px solid #333;
- text-shadow: 0px 1px 1px #333;
- padding: 4px 6px;
- outline: none;
-}
-
-/*** quota indicator ***/
-#quotadisplay {
- left: 6px;
- font-size: 12px;
- font-weight: bold;
- text-shadow: 0px 1px 1px #fff;
- padding-left: 30px;
- height: 18px;
- background: url(images/quota.png) -100px 0 no-repeat;
-}
-
-/*** popup menus ***/
-.popupmenu,#rcmKSearchpane {
- display: none;
- position: absolute;
- top: 32px;
- left: 90px;
- width: auto;
- background: #444;
- border: 1px solid #999;
- z-index: 240;
- border-radius: 4px;
- box-shadow: 0 2px 6px 0 #333;
- -moz-box-shadow: 0 2px 6px 0 #333;
- -webkit-box-shadow: 0 2px 6px 0 #333;
- -o-box-shadow: 0 2px 6px 0 #333;
-}
-
-.popupmenu.dropdown {
- border-radius: 0 0 4px 4px;
- border-top: 0;
-}
-
-ul.toolbarmenu,#rcmKSearchpane ul {
- margin: 0;
- padding: 0;
- list-style: none;
-}
-
-.googie_list td,ul.toolbarmenu li,#rcmKSearchpane ul li {
- color: #fff;
- white-space: nowrap;
- min-width: 130px;
- margin: 0;
- border-top: 1px solid #5a5a5a;
- border-bottom: 1px solid #333;
-}
-
-.googie_list tr:first-child td,ul.toolbarmenu li:first-child,select.decorated option:first-child
- {
- border-top: 0;
-}
-
-.googie_list tr:last-child td,ul.toolbarmenu li:last-child,select.decorated option:last-child
- {
- border-bottom: 0;
-}
-
-.googie_list td span,ul.toolbarmenu li a {
- display: block;
- color: #666;
- text-shadow: 0px 1px 1px #333;
- text-decoration: none;
- min-height: 14px;
- padding: 6px 10px 6px 10px;
-}
-
-.googie_list td span {
- padding: 3px 10px;
-}
-
-.googie_list td span,ul.toolbarmenu li a.active {
- color: #fff;
- cursor: default;
-}
-
-.googie_list td.googie_list_onhover,ul.toolbarmenu li a.active:hover,#rcmKSearchpane ul li.selected,select.decorated option:hover,select.decorated option[selected='selected']
- {
- background-color: #00aad6;
- background: -moz-linear-gradient(top, #00aad6 0%, #008fc9 100%);
- background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #00aad6),
- color-stop(100%, #008fc9) );
- background: -o-linear-gradient(top, #00aad6 0%, #008fc9 100%);
- background: -ms-linear-gradient(top, #00aad6 0%, #008fc9 100%);
- background: linear-gradient(top, #00aad6 0%, #008fc9 100%);
-}
-
-ul.toolbarmenu.iconized li a,ul.toolbarmenu.selectable li a {
- padding-left: 30px;
-}
-
-ul.toolbarmenu.selectable li a.selected {
- background: url(images/messages.png) 4px -27px no-repeat;
-}
-
-ul.toolbarmenu li label {
- display: block;
- color: #fff;
- padding: 4px 8px;
- text-shadow: 0px 1px 1px #333;
-}
-
-ul.toolbarmenu li a.icon {
- color: #eee;
- padding: 2px 6px;
-}
-
-ul.toolbarmenu li span.icon {
- display: block;
- min-height: 14px;
- padding: 4px 4px 1px 24px;
- height: 17px;
- background-image: url(images/listicons.png);
- background-position: -100px 0;
- background-repeat: no-repeat;
- opacity: 0.2;
- filter: alpha(opacity = 20);
-}
-
-ul.toolbarmenu li a.active span.icon {
- opacity: 0.99;
- filter: alpha(opacity = 100);
-}
-
-ul.toolbarmenu li span.read {
- background-position: 0 -1220px;
-}
-
-ul.toolbarmenu li span.unread {
- background-position: 0 -1196px;
-}
-
-ul.toolbarmenu li span.flagged {
- background-position: 0 -1244px;
-}
-
-ul.toolbarmenu li span.unflagged {
- background-position: 0 -1268px;
-}
-
-ul.toolbarmenu li span.mail {
- background-position: 0 -1293px;
-}
-
-ul.toolbarmenu li span.list {
- background-position: 0 -1317px;
-}
-
-ul.toolbarmenu li span.invert {
- background-position: 0 -1340px;
-}
-
-ul.toolbarmenu li span.cross {
- background-position: 0 -1365px;
-}
-
-ul.toolbarmenu li span.print {
- background-position: 0 -1436px;
-}
-
-ul.toolbarmenu li span.download {
- background-position: 0 -1412px;
-}
-
-ul.toolbarmenu li span.edit {
- background-position: 0 -1388px;
-}
-
-ul.toolbarmenu li span.viewsource {
- background-position: 0 -1460px;
-}
-
-ul.toolbarmenu li span.extwin {
- background-position: 0 -1484px;
-}
-
-ul.toolbarmenu li span.conversation {
- background-position: 0 -1532px;
-}
-
-#rcmKSearchpane {
- border-radius: 0 0 4px 4px;
- border-top: 0;
-}
-
-#rcmKSearchpane ul li {
- text-shadow: 0px 1px 1px #333;
- text-decoration: none;
- min-height: 14px;
- padding: 6px 10px 6px 10px;
- border: 0;
- cursor: default;
-}
-
-.popupdialog {
- display: none;
- padding: 10px;
-}
-
-.popupdialog .formbuttons {
- margin: 20px 0 4px 0;
-}
-
-.ui-dialog .prompt input {
- display: block;
- margin: 8px 0;
-}
-
-.hint {
- margin: 4px 0;
- color: #999;
- text-shadow: 0px 1px 1px #fff;
-}
-
-.splitter {
- user-select: none;
- -moz-user-select: none;
- -khtml-user-select: none;
- position: absolute;
- background: url(images/splitter.png) center no-repeat;
-}
-
-.splitter-h {
- height: 10px;
- width: 100%;
- cursor: n-resize;
- cursor: row-resize;
- background-position: center 0;
-}
-
-.splitter-v {
- width: 10px;
- height: 100%;
- cursor: e-resize;
- cursor: col-resize;
- background-position: 0 center;
-}
-
-#rcmdraglayer {
- min-width: 260px;
- width: auto !important;
- width: 260px;
- padding: 6px 8px;
- background: #444;
- border: 1px solid #555;
- border-radius: 4px;
- box-shadow: 0 2px 6px 0 #333;
- -moz-box-shadow: 0 2px 6px 0 #333;
- -webkit-box-shadow: 0 2px 6px 0 #333;
- -o-box-shadow: 0 2px 6px 0 #333;
- z-index: 250;
- color: #ccc;
- white-space: nowrap;
- opacity: 0.92;
- filter: alpha(opacity = 92);
- text-shadow: 0px 1px 1px #333;
-}
-
-#rcmdraglayer:after {
- content: "";
- position: absolute;
- top: 6px;
- left: -6px;
- border-style: solid;
- border-width: 6px 6px 6px 0;
- border-color: transparent #444;
- /* reduce the damage in FF3.0 */
- display: block;
- width: 0;
- z-index: 251;
-}
-
-.draglayercopy:before {
- position: absolute;
- bottom: -6px;
- left: -6px;
- content: " ";
- width: 16px;
- height: 16px;
- background: url(images/buttons.png) -7px -358px no-repeat;
- z-index: 255;
-}
-
-/*** attachment list ***/
-.attachmentslist {
- list-style: none;
- margin: 0;
- padding: 0;
- overflow: hidden;
- text-overflow: ellipsis;
-}
-
-.attachmentslist li {
- display: block;
- position: relative;
- background: url(images/filetypes.png) 0 0 no-repeat;
- margin-bottom: 1px;
-}
-
-.attachmentslist li.pdf {
- background-position: 0 -26px;
-}
-
-.attachmentslist li.doc,.attachmentslist li.docx,.attachmentslist li.msword
- {
- background-position: 0 -52px;
-}
-
-.attachmentslist li.odt {
- background-position: 0 -78px;
-}
-
-.attachmentslist li.xls,.attachmentslist li.xlsx,.attachmentslist li.msexcel
- {
- background-position: 0 -104px;
-}
-
-.attachmentslist li.ods {
- background-position: 0 -130px;
-}
-
-.attachmentslist li.zip,.attachmentslist li.gz {
- background-position: 0 -156px;
-}
-
-.attachmentslist li.rar {
- background-position: 0 -182px;
-}
-
-.attachmentslist li.image {
- background-position: 0 -208px;
-}
-
-.attachmentslist li.jpg,.attachmentslist li.jpeg {
- background-position: 0 -234px;
-}
-
-.attachmentslist li.png {
- background-position: 0 -260px;
-}
-
-.attachmentslist li.m4p {
- background-position: 0 -286px;
-}
-
-.attachmentslist li.mp3,.attachmentslist li.audio {
- background-position: 0 -312px;
-}
-
-.attachmentslist li.video {
- background-position: 0 -338px;
-}
-
-.attachmentslist li.txt,.attachmentslist li.text {
- background-position: 0 -416px;
-}
-
-.attachmentslist li.ics,.attachmentslist li.calendar {
- background-position: 0 -364px;
-}
-
-.attachmentslist li.vcard {
- background-position: 0 -390px;
-}
-
-.attachmentslist li.html {
- background-position: 0 -442px;
-}
-
-.attachmentslist li a,#compose-attachments ul li {
- display: block;
- color: #333;
- font-weight: bold;
- padding: 8px 4px 3px 30px;
- text-shadow: 0px 1px 1px #fff;
- text-decoration: none;
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
-}
-
-#compose-attachments ul li {
- padding-right: 28px;
-}
-
-.attachmentslist li a:hover {
- text-decoration: underline;
-}
-
-.attachmentslist li.uploading {
- background: url(images/ajaxloader.gif) 2px 6px no-repeat;
-}
-
-.attachmentslist li a.delete,.attachmentslist li a.cancelupload {
- position: absolute;
- top: 6px;
- right: 0;
- width: 24px;
- height: 18px;
- padding: 0;
- text-decoration: none;
- text-indent: -5000px;
- background: url(images/buttons.png) -7px -337px no-repeat;
-}
-
-.attachmentslist li a.cancelupload {
- background-position: -7px -377px;
-}
-
-/*** fieldset tabs ***/
-.tabsbar {
- margin-bottom: 12px;
- padding-top: 15px;
- height: 27px;
- white-space: nowrap;
-}
-
-.tabsbar .tablink {
- padding: 15px 1px 15px 0;
- background: #f8f8f8;
- background: -moz-linear-gradient(top, #f8f8f8 0%, #d3d3d3 50%, #f8f8f8 100%);
- background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #f8f8f8),
- color-stop(50%, #d3d3d3), color-stop(100%, #f8f8f8) );
- background: -webkit-linear-gradient(top, #f8f8f8 0%, #d3d3d3 50%, #f8f8f8 100%);
- background: -o-linear-gradient(top, #f8f8f8 0%, #d3d3d3 50%, #f8f8f8 100%);
- background: -ms-linear-gradient(top, #f8f8f8 0%, #d3d3d3 50%, #f8f8f8 100%);
- background: linear-gradient(top, #f8f8f8 0%, #d3d3d3 50%, #f8f8f8 100%);
-}
-
-.tabsbar .tablink:last-child {
- background: none;
-}
-
-.tabsbar .tablink:last-child a {
- border-right: 0;
-}
-
-.tabsbar .tablink a {
- padding: 15px;
- color: #999;
- font-size: 12px;
- font-weight: bold;
- text-decoration: none;
- background: #fff;
- border-right: 1px solid #fafafa;
-}
-
-.tabsbar .tablink.selected a {
- color: #004458;
- background: #f6f6f6;
- background: -moz-linear-gradient(top, #fff 40%, #efefef 100%);
- background: -webkit-gradient(linear, left top, left bottom, color-stop(40%, #fff),
- color-stop(100%, #efefef) );
- background: -o-linear-gradient(top, #fff 40%, #efefef 100%);
- background: -ms-linear-gradient(top, #fff 40%, #efefef 100%);
- background: linear-gradient(top, #fff 40%, #efefef 100%);
-}
-
-fieldset.tab {
-<<<<<<< HEAD
- border: 0;
- padding: 0;
- margin-left: 0;
->>>>>>> refactoring theme 1 - login page
-=======
- border: 0;
- padding: 0;
- margin-left: 0;
->>>>>>> beautify the multiuploader
-}
-
-.gwt-SplitLayoutPanel-HDragger {
- user-select: none;
- -moz-user-select: none;
- -khtml-user-select: none;
- position: absolute;
- background: url(images/splitter.png) center no-repeat;
- width: 10px;
- height: 100%;
- cursor: e-resize;
- cursor: col-resize;
- background-position: 0 center;
-}
-
-.gwt-SplitLayoutPanel-VDragger {
-<<<<<<< HEAD
-<<<<<<< HEAD
- cursor: row-resize;
- position: absolute;
- background: url(images/splitter.png) center no-repeat;
- background-position: center 0;
-}
-=======
- cursor: row-resize;
- position: absolute;
- background: url(images/splitter.png) center no-repeat;
- background-position: center 0;
-=======
- user-select: none;
- -moz-user-select: none;
- -khtml-user-select: none;
- position: absolute;
- background: url(images/splitter.png) center no-repeat;
- height: 10px;
- width: 100%;
- cursor: n-resize;
- cursor: row-resize;
- background-position: center 0;
->>>>>>> make delete label in label setting work(backend now)
-}
-
-.GWTUpld,table.GWTUpld td {
- font-family: Verdana, Arial;
- font-size: 12px;
-}
-
-.GWTUpld form,.GWTUpld .upld-form-elements {
- padding: 0px;
- vertical-align: top;
-}
-
-.GWTUpld .upld-status {
- font-family: arial;
- font-size: 12px;
- font-weight: bold;
-}
-
-.GWTUpld .upld-status div.cancel {
- background: url(images/buttons.png) -7px -337px no-repeat;
- width: 24px;
- height: 18px;
- cursor: pointer;
- margin-top: 1px;
-}
-
-* html .GWTUpld .upld-status div.cancel {
- width: 14px;
- height: 10px;
- margin-top: 2px;
-}
-
-.GWTUpld .upld-status .filename {
- overflow: hidden;
- white-space: nowrap;
- margin-left: 8px;
- margin-right: 11px;
- height: 100%;
- font-size: 12px;
-}
-
-.GWTUpld .upld-status .status {
- padding-left: 8px;
- white-space: nowrap;
- height: 100%;
- font-size: 12px;
-}
-
-.GWTUpld .upld-status .status-success {
- color: green;
-}
-
-.GWTUpld .upld-status .status-error,.GWTUpld .upld-status .status-canceled
- {
- color: red;
-}
-
-.GWTUpld .prgbar-back {
- background: #ffffff none repeat scroll 0 0;
- border: 1px solid #999999;
- height: 10px;
- overflow: hidden;
- padding: 1px;
- width: 100px;
- float: left;
-}
-
-* html .GWTUpld .prgbar-back {
- height: 12px;
- margin-top: 2px;
-}
-
-.GWTUpld .prgbar-done {
- background: #d4e4ff none repeat scroll 0 0;
- font-size: 0;
- height: 100%;
- float: left;
-}
-
-.GWTUpld .prgbar-msg {
- position: absolute;
- z-index: 9;
- font-size: 9px;
- font-weight: normal;
- margin-left: 3px;
-}
-
-* html .GWTUpld .prgbar-msg {
- top: 0px;
- left: 4px;
-}
-
-.GWTUpld .changed {
- color: red;
- font-weight: bold;
- text-decoration: blink;
-}
-
-.gwt-PopupPanel .GWTUpld {
- border: 2px groove #F6A828;
- padding: 10px;
- background: #bf984c;
- -moz-border-radius-bottomleft: 6px;
- -moz-border-radius-bottomright: 6px;
- -moz-border-radius-topleft: 6px;
- -moz-border-radius-topright: 6px;
-}
-
-.GWTUpld .DecoratedFileUpload {
- margin-right: 5px;
-}
-
-.GWTUpld .DecoratedFileUpload .gwt-Button,.GWTUpld .DecoratedFileUpload .gwt-Anchor,.GWTUpld .DecoratedFileUpload .gwt-Label
- {
- white-space: nowrap;
- font-size: 10px;
-}
-
-.GWTUpld .gwt-Button,.GWTUpld .gwt-FileUpload {
- font-size: 10px;
- min-height: 15px;
-}
-
-.GWTUpld .DecoratedFileUpload .gwt-Anchor,.GWTUpld .DecoratedFileUpload .gwt-Label
- {
- color: blue;
- text-decoration: underline;
- cursor: pointer;
-}
-
-.GWTUpld .gwt-Button:HOVER,.GWTUpld .DecoratedFileUpload .gwt-Button-over,.GWTUpld .DecoratedFileUpload .gwt-Anchor-over,.GWTUpld .DecoratedFileUpload .gwt-Label-over
- {
- color: #af6b29;
-}
-
-.GWTUpld .DecoratedFileUpload-disabled .gwt-Button,.GWTUpld .DecoratedFileUpload-disabled .gwt-Anchor,.GWTUpld .DecoratedFileUpload-disabled .gwt-Label
- {
- color: grey;
-}
-
-.gwt-PopupPanelGlass {
- background-color: #d4e4ff;
- opacity: 0.3;
-<<<<<<< HEAD
- filter: alpha(opacity = 30);
-}
->>>>>>> beautify the multiuploader
-=======
- filter: alpha(opacity = 30);
-}
->>>>>>> make delete label in label setting work(backend now)
-=======
-}
->>>>>>> fixed issue#73, using LinkedHashSet in memory to store the contacts list like 'Echo Wang <ec...@gmail.com>'
-=======
}
->>>>>>> make a skeleton in the setting place, for more setting items
Modified: james/hupa/trunk/client/src/test/java/org/apache/hupa/client/mock/MockMessageSendDisplay.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/test/java/org/apache/hupa/client/mock/MockMessageSendDisplay.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/client/src/test/java/org/apache/hupa/client/mock/MockMessageSendDisplay.java (original)
+++ james/hupa/trunk/client/src/test/java/org/apache/hupa/client/mock/MockMessageSendDisplay.java Mon Sep 23 07:04:08 2013
@@ -19,60 +19,20 @@
package org.apache.hupa.client.mock;
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
import gwtupload.client.IUploader;
import org.apache.hupa.client.activity.ComposeActivity.Displayable;
import org.apache.hupa.shared.rpc.ContactsResult.Contact;
import org.apache.hupa.widgets.ui.HasEnable;
-=======
->>>>>>> first commit
-=======
->>>>>>> first commit
-=======
-import gwtupload.client.IUploader;
-
-import org.apache.hupa.client.activity.ComposeActivity.Displayable;
-import org.apache.hupa.shared.rpc.ContactsResult.Contact;
-import org.apache.hupa.widgets.ui.HasEnable;
-
->>>>>>> delete some deprecated code
import com.google.gwt.event.dom.client.HasClickHandlers;
import com.google.gwt.user.client.ui.Focusable;
import com.google.gwt.user.client.ui.HasHTML;
import com.google.gwt.user.client.ui.HasText;
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> scrub code, remove deprecated code
import com.google.gwt.user.client.ui.ListBox;
import com.google.gwt.user.client.ui.Widget;
public class MockMessageSendDisplay implements Displayable {
-=======
-=======
->>>>>>> first commit
-import com.google.gwt.user.client.ui.Widget;
-
-<<<<<<< HEAD
-import gwtupload.client.IUploader;
-
-import org.apache.hupa.client.mvp.MessageSendPresenter.Display;
-import org.apache.hupa.shared.rpc.ContactsResult.Contact;
-import org.apache.hupa.widgets.ui.HasEnable;
-
-public class MockMessageSendDisplay implements Display {
-<<<<<<< HEAD
->>>>>>> first commit
-=======
->>>>>>> first commit
-=======
-public class MockMessageSendDisplay implements Displayable {
->>>>>>> delete some deprecated code
HasClickHandlers backClick = new MockWidget();
HasText bccText = new MockWidget();
@@ -110,22 +70,6 @@ public class MockMessageSendDisplay impl
return editorFocus;
}
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-=======
->>>>>>> first commit
- public HasText getFromText() {
- return fromText;
- }
-
-<<<<<<< HEAD
->>>>>>> first commit
-=======
->>>>>>> first commit
-=======
->>>>>>> scrub code, remove deprecated code
public HasHTML getMessageHTML() {
return messageHtml;
}
@@ -184,11 +128,6 @@ public class MockMessageSendDisplay impl
return true;
}
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> scrub code, remove deprecated code
@Override
public void showCc() {
// TODO Auto-generated method stub
@@ -339,11 +278,4 @@ public class MockMessageSendDisplay impl
return null;
}
-<<<<<<< HEAD
-=======
->>>>>>> first commit
-=======
->>>>>>> first commit
-=======
->>>>>>> scrub code, remove deprecated code
}
Modified: james/hupa/trunk/client/src/test/java/org/apache/hupa/client/mock/MockUploader.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/test/java/org/apache/hupa/client/mock/MockUploader.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/client/src/test/java/org/apache/hupa/client/mock/MockUploader.java (original)
+++ james/hupa/trunk/client/src/test/java/org/apache/hupa/client/mock/MockUploader.java Mon Sep 23 07:04:08 2013
@@ -19,9 +19,6 @@
package org.apache.hupa.client.mock;
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
import gwtupload.client.IFileInput;
import gwtupload.client.IUploadStatus;
import gwtupload.client.IUploadStatus.Status;
@@ -33,33 +30,6 @@ import com.google.gwt.core.client.JavaSc
import com.google.gwt.event.shared.HandlerRegistration;
import com.google.gwt.user.client.ui.Widget;
-=======
-=======
->>>>>>> first commit
-import com.google.gwt.core.client.JavaScriptObject;
-import com.google.gwt.event.shared.HandlerRegistration;
-import com.google.gwt.user.client.ui.Widget;
-
-=======
->>>>>>> commit frequently based on (http://t.cn/zjxJ71X), there should be more robust and user-friendly features to develop.
-import gwtupload.client.IFileInput;
-import gwtupload.client.IUploadStatus;
-import gwtupload.client.IUploadStatus.Status;
-import gwtupload.client.IUploader;
-
-import java.util.Iterator;
-
-<<<<<<< HEAD
-<<<<<<< HEAD
->>>>>>> first commit
-=======
->>>>>>> first commit
-=======
-import com.google.gwt.core.client.JavaScriptObject;
-import com.google.gwt.event.shared.HandlerRegistration;
-import com.google.gwt.user.client.ui.Widget;
-
->>>>>>> commit frequently based on (http://t.cn/zjxJ71X), there should be more robust and user-friendly features to develop.
public class MockUploader implements IUploader {
public HandlerRegistration addOnCancelUploadHandler(OnCancelUploaderHandler handler) {
@@ -148,19 +118,7 @@ public class MockUploader implements IUp
// TODO Auto-generated method stub
}
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
- public void setValidExtensions(String... ext) {
-=======
- public void setValidExtensions(String[] ext) {
->>>>>>> first commit
-=======
- public void setValidExtensions(String[] ext) {
->>>>>>> first commit
-=======
public void setValidExtensions(String... ext) {
->>>>>>> upgrade maven-processor-plugin to the latest 2.2.4; change the middle-man in MessageListActivityMapper to string instead of the whole MessageFolderPlace
// TODO Auto-generated method stub
}
Modified: james/hupa/trunk/client/src/test/java/org/apache/hupa/client/validation/EmailListValidatorTest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/test/java/org/apache/hupa/client/validation/EmailListValidatorTest.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/client/src/test/java/org/apache/hupa/client/validation/EmailListValidatorTest.java (original)
+++ james/hupa/trunk/client/src/test/java/org/apache/hupa/client/validation/EmailListValidatorTest.java Mon Sep 23 07:04:08 2013
@@ -31,17 +31,7 @@ public class EmailListValidatorTest exte
assertFalse(EmailListValidator.isValidAddressList("abc@abc.def ; ; MMM <mc...@aa>;;;"));
assertTrue(EmailListValidator.isValidAddressList("abc@abc.def ; ; MMM <mc...@aa.co>;;;"));
assertTrue(EmailListValidator.isValidAddressList("abc@abc.def\nMMM <mc...@aa.co>;;;"));
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
assertTrue(EmailListValidator.isValidAddressList("server-dev-sc.1342023625.aldemmhlhmcipjmoflol-abc=gmail.com@james.apache.org"));
-=======
->>>>>>> first commit
-=======
->>>>>>> first commit
-=======
- assertTrue(EmailListValidator.isValidAddressList("server-dev-sc.1342023625.aldemmhlhmcipjmoflol-abc=gmail.com@james.apache.org"));
->>>>>>> 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/mock/pom.xml
URL: http://svn.apache.org/viewvc/james/hupa/trunk/mock/pom.xml?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/mock/pom.xml (original)
+++ james/hupa/trunk/mock/pom.xml Mon Sep 23 07:04:08 2013
@@ -17,54 +17,12 @@
specific language governing permissions and limitations
under the License.
-->
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
<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.james.hupa</groupId>
<artifactId>hupa-parent</artifactId>
-<<<<<<< HEAD
- <version>0.0.3-SNAPSHOT</version>
-=======
-=======
->>>>>>> first commit
-<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">
-<<<<<<< HEAD
-=======
-<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">
->>>>>>> constantly changed by manolo
-=======
->>>>>>> first commit
-=======
-<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">
->>>>>>> constantly changed by manolo
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.hupa</groupId>
- <artifactId>hupa-parent</artifactId>
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
- <version>0.0.2-SNAPSHOT</version>
->>>>>>> first commit
-=======
- <version>0.0.3-SNAPSHOT</version>
->>>>>>> constantly changed by manolo
-=======
- <version>0.0.2-SNAPSHOT</version>
->>>>>>> first commit
-=======
- <version>0.0.3-SNAPSHOT</version>
->>>>>>> constantly changed by manolo
-=======
<version>0.0.5-SNAPSHOT</version>
->>>>>>> Set snapshot version higger than the current hupa in svn repo
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hupa-mock</artifactId>
@@ -73,15 +31,7 @@
<description>Mock objects for hupa</description>
<dependencies>
<dependency>
-<<<<<<< HEAD
-<<<<<<< HEAD
<groupId>${project.groupId}</groupId>
-=======
- <groupId>org.apache.hupa</groupId>
->>>>>>> first commit
-=======
- <groupId>org.apache.hupa</groupId>
->>>>>>> first commit
<artifactId>hupa-shared</artifactId>
</dependency>
<dependency>
@@ -119,23 +69,6 @@
<artifactId>mail</artifactId>
</dependency>
<dependency>
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-=======
->>>>>>> first commit
- <groupId>net.customware.gwt.dispatch
- </groupId>
- <artifactId>gwt-dispatch</artifactId>
- </dependency>
- <dependency>
-<<<<<<< HEAD
->>>>>>> first commit
-=======
->>>>>>> first commit
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
<groupId>com.googlecode.gwtupload</groupId>
<artifactId>gwtupload</artifactId>
</dependency>
Modified: james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/guice/AbstractGuiceTestModule.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/guice/AbstractGuiceTestModule.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/guice/AbstractGuiceTestModule.java (original)
+++ james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/guice/AbstractGuiceTestModule.java Mon Sep 23 07:04:08 2013
@@ -21,30 +21,10 @@ package org.apache.hupa.server.guice;
import java.util.Properties;
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
import org.apache.hupa.shared.data.SettingsImpl;
import org.apache.hupa.shared.data.UserImpl;
import com.google.inject.AbstractModule;
-<<<<<<< HEAD
-=======
-=======
->>>>>>> first commit
-import net.customware.gwt.dispatch.server.guice.ActionHandlerModule;
-
-=======
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
-import org.apache.hupa.shared.data.SettingsImpl;
-import org.apache.hupa.shared.data.UserImpl;
-
-<<<<<<< HEAD
->>>>>>> first commit
-=======
->>>>>>> first commit
-=======
->>>>>>> re-add server unit tests
import com.google.inject.Inject;
import com.google.inject.name.Named;
@@ -93,34 +73,10 @@ import com.google.inject.name.Named;
* @author manolo
*
*/
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-public abstract class AbstractGuiceTestModule extends AbstractModule{
-
- protected static class TestUser extends UserImpl {
-
-=======
-=======
->>>>>>> first commit
-public abstract class AbstractGuiceTestModule extends ActionHandlerModule {
-=======
-public abstract class AbstractGuiceTestModule {
->>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
-
- protected static class TestUser extends UserImpl {
- private static final long serialVersionUID = 1L;
-<<<<<<< HEAD
->>>>>>> first commit
-=======
->>>>>>> first commit
-=======
public abstract class AbstractGuiceTestModule extends AbstractModule{
protected static class TestUser extends UserImpl {
->>>>>>> re-add server unit tests
@Inject
public TestUser(@Named("Username") String username,
@Named("Password") String password,
@@ -130,21 +86,7 @@ public abstract class AbstractGuiceTestM
@Named("DefaultDraftsFolder") final String draft) {
setName(username);
setPassword(password);
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
- setSettings(new SettingsImpl() {
-=======
- setSettings(new Settings() {
- private static final long serialVersionUID = 1L;
->>>>>>> first commit
-=======
- setSettings(new Settings() {
- private static final long serialVersionUID = 1L;
->>>>>>> first commit
-=======
setSettings(new SettingsImpl() {
->>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
{
setInboxFolderName(inbox);
setSentFolderName(sent);
@@ -172,74 +114,17 @@ public abstract class AbstractGuiceTestM
put("IMAPServerPort", "143");
put("IMAPS", "false");
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-=======
->>>>>>> first commit
- put("TrustStore", "my-truststore");
- put("TrustStorePassword", "my-truststore-password");
-
- put("IMAPConnectionPoolSize", "4");
- put("IMAPConnectionPoolTimeout", "300000");
-
-<<<<<<< HEAD
->>>>>>> first commit
-=======
->>>>>>> constantly changed by manolo
-=======
->>>>>>> first commit
-=======
->>>>>>> constantly changed by manolo
put("DefaultInboxFolder", "INBOX");
put("DefaultTrashFolder", "Trash");
put("DefaultSentFolder", "Sent");
put("DefaultDraftsFolder", "Drafts");
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
- put("PostFetchMessageCount", "0");
-
->>>>>>> first commit
-=======
->>>>>>> constantly changed by manolo
-=======
- put("PostFetchMessageCount", "0");
-
->>>>>>> first commit
-=======
->>>>>>> constantly changed by manolo
put("SMTPServerAddress", "localhost");
put("SMTPServerPort", "25");
put("SMTPS", "false");
put("SMTPAuth", "true");
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
put("SessionDebug", "true");
-=======
- put("SessionDebug", "false");
-
- put("DefaultUserSessionId", "just_an_id");
->>>>>>> first commit
-=======
- put("SessionDebug", "true");
->>>>>>> constantly changed by manolo
-=======
- put("SessionDebug", "false");
-
- put("DefaultUserSessionId", "just_an_id");
->>>>>>> first commit
-=======
- put("SessionDebug", "true");
->>>>>>> constantly changed by manolo
}
};
@@ -259,74 +144,17 @@ public abstract class AbstractGuiceTestM
put("IMAPServerPort", "143");
put("IMAPS", "false");
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-=======
->>>>>>> first commit
- put("TrustStore", "my-truststore");
- put("TrustStorePassword", "my-truststore-password");
-
- put("IMAPConnectionPoolSize", "4");
- put("IMAPConnectionPoolTimeout", "300000");
-
-<<<<<<< HEAD
->>>>>>> first commit
-=======
->>>>>>> constantly changed by manolo
-=======
->>>>>>> first commit
-=======
->>>>>>> constantly changed by manolo
put("DefaultInboxFolder", "INBOX");
put("DefaultTrashFolder", "INBOX.Trash");
put("DefaultSentFolder", "INBOX.Sent");
put("DefaultDraftsFolder", "INBOX.Drafts");
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
- put("PostFetchMessageCount", "0");
-
->>>>>>> first commit
-=======
->>>>>>> constantly changed by manolo
-=======
- put("PostFetchMessageCount", "0");
-
->>>>>>> first commit
-=======
->>>>>>> constantly changed by manolo
put("SMTPServerAddress", "mail.hotelsearch.com");
put("SMTPServerPort", "25");
put("SMTPS", "false");
put("SMTPAuth", "true");
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
put("SessionDebug", "true");
-=======
- put("SessionDebug", "false");
-
- put("DefaultUserSessionId", "just_an_id");
->>>>>>> first commit
-=======
- put("SessionDebug", "true");
->>>>>>> constantly changed by manolo
-=======
- put("SessionDebug", "false");
-
- put("DefaultUserSessionId", "just_an_id");
->>>>>>> first commit
-=======
- put("SessionDebug", "true");
->>>>>>> constantly changed by manolo
}
};
@@ -345,24 +173,6 @@ public abstract class AbstractGuiceTestM
put("IMAPServerPort", "993");
put("IMAPS", "true");
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
- put("TrustStore", "my-truststore");
- put("TrustStorePassword", "my-truststore-password");
-
->>>>>>> first commit
-=======
->>>>>>> constantly changed by manolo
-=======
- put("TrustStore", "my-truststore");
- put("TrustStorePassword", "my-truststore-password");
-
->>>>>>> first commit
-=======
->>>>>>> constantly changed by manolo
put("IMAPConnectionPoolSize", "4");
put("IMAPConnectionPoolTimeout", "300000");
@@ -371,48 +181,12 @@ public abstract class AbstractGuiceTestM
put("DefaultSentFolder", "[Gmail]/Sent Mail");
put("DefaultDraftsFolder", "[Gmail]/Drafts");
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
- put("PostFetchMessageCount", "0");
-
->>>>>>> first commit
-=======
->>>>>>> constantly changed by manolo
-=======
- put("PostFetchMessageCount", "0");
-
->>>>>>> first commit
-=======
->>>>>>> constantly changed by manolo
put("SMTPServerAddress", "smtp.gmail.com");
put("SMTPServerPort", "465");
put("SMTPS", "true");
put("SMTPAuth", "true");
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
- put("SessionDebug", "true");
-=======
- put("SessionDebug", "false");
-
- put("DefaultUserSessionId", "just_an_id");
->>>>>>> first commit
-=======
- put("SessionDebug", "true");
->>>>>>> constantly changed by manolo
-=======
- put("SessionDebug", "false");
-
- put("DefaultUserSessionId", "just_an_id");
->>>>>>> first commit
-=======
put("SessionDebug", "true");
->>>>>>> constantly changed by manolo
}
};
Modified: james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockConstants.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockConstants.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockConstants.java (original)
+++ james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockConstants.java Mon Sep 23 07:04:08 2013
@@ -19,68 +19,21 @@
package org.apache.hupa.server.mock;
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
import java.util.Properties;
import org.apache.hupa.shared.data.SettingsImpl;
import org.apache.hupa.shared.data.UserImpl;
import org.apache.hupa.shared.domain.Settings;
import org.apache.hupa.shared.domain.User;
-=======
-=======
->>>>>>> first commit
-import org.apache.hupa.shared.data.Settings;
-import org.apache.hupa.shared.data.User;
-
-=======
->>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
-import java.util.Properties;
-<<<<<<< HEAD
->>>>>>> first commit
-=======
->>>>>>> first commit
-
-import org.apache.hupa.shared.data.SettingsImpl;
-import org.apache.hupa.shared.data.UserImpl;
-import org.apache.hupa.shared.domain.Settings;
-import org.apache.hupa.shared.domain.User;
/**
* Constants and properties used for mock mode
*/
public class MockConstants {
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-
- public static String SESSION_ID = "MockID";
-
- public final static Settings mockSettings = new SettingsImpl() {
-=======
-=======
public static String SESSION_ID = "MockID";
->>>>>>> constantly changed by manolo
-=======
-
- public static String SESSION_ID = "MockID";
->>>>>>> constantly changed by manolo
-
-<<<<<<< HEAD
- public final static Settings mockSettings = new Settings() {
- private static final long serialVersionUID = 1L;
->>>>>>> first commit
-=======
- public final static Settings mockSettings = new Settings() {
- private static final long serialVersionUID = 1L;
->>>>>>> first commit
-=======
public final static Settings mockSettings = new SettingsImpl() {
->>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
{
setInboxFolderName(MockIMAPStore.MOCK_INBOX_FOLDER);
setSentFolderName(MockIMAPStore.MOCK_SENT_FOLDER);
@@ -94,20 +47,6 @@ public class MockConstants {
{
put("Username", MockIMAPStore.MOCK_LOGIN);
put("Password", MockIMAPStore.MOCK_LOGIN);
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
- put("DefaultUserSessionId", "DEMO_ID");
->>>>>>> first commit
-=======
->>>>>>> constantly changed by manolo
-=======
- put("DefaultUserSessionId", "DEMO_ID");
->>>>>>> first commit
-=======
->>>>>>> constantly changed by manolo
put("IMAPServerAddress", MockIMAPStore.MOCK_HOST);
put("SMTPServerAddress", MockIMAPStore.MOCK_HOST);
@@ -123,21 +62,7 @@ public class MockConstants {
}
};
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
public final static Settings mockUserSettings = new SettingsImpl() {
-=======
- public final static Settings mockUserSettings = new Settings() {
- private static final long serialVersionUID = 1L;
->>>>>>> first commit
-=======
- public final static Settings mockUserSettings = new Settings() {
- private static final long serialVersionUID = 1L;
->>>>>>> first commit
-=======
- public final static Settings mockUserSettings = new SettingsImpl() {
->>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
{
setInboxFolderName(MockIMAPStore.MOCK_INBOX_FOLDER);
setSentFolderName(MockIMAPStore.MOCK_SENT_FOLDER);
@@ -146,21 +71,7 @@ public class MockConstants {
}
};
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
- public final static User mockUser = new UserImpl() {
-=======
- public final static User mockUser = new User() {
- private static final long serialVersionUID = 1L;
->>>>>>> first commit
-=======
- public final static User mockUser = new User() {
- private static final long serialVersionUID = 1L;
->>>>>>> first commit
-=======
public final static User mockUser = new UserImpl() {
->>>>>>> Make chechsession and login work with RF, with refactoring fetch folders.
{
setName(MockIMAPStore.MOCK_LOGIN);
setPassword(MockIMAPStore.MOCK_LOGIN);
Modified: james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockHttpSession.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockHttpSession.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockHttpSession.java (original)
+++ james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockHttpSession.java Mon Sep 23 07:04:08 2013
@@ -30,20 +30,6 @@ import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpSessionContext;
import com.google.inject.Inject;
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-import com.google.inject.name.Named;
->>>>>>> first commit
-=======
->>>>>>> constantly changed by manolo
-=======
-import com.google.inject.name.Named;
->>>>>>> first commit
-=======
->>>>>>> constantly changed by manolo
@SuppressWarnings("deprecation")
public class MockHttpSession implements HttpSession{
@@ -54,33 +40,9 @@ public class MockHttpSession implements
private static int seq = 0;
@Inject
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
public MockHttpSession() {
cTime = System.currentTimeMillis();
this.id = MockConstants.SESSION_ID + "-" + seq++;
-=======
- public MockHttpSession(@Named("DefaultUserSessionId") String id) {
- cTime = System.currentTimeMillis();
- this.id = id + "-" + seq++;
->>>>>>> first commit
-=======
- public MockHttpSession() {
- cTime = System.currentTimeMillis();
- this.id = MockConstants.SESSION_ID + "-" + seq++;
->>>>>>> constantly changed by manolo
-=======
- public MockHttpSession(@Named("DefaultUserSessionId") String id) {
- cTime = System.currentTimeMillis();
- this.id = id + "-" + seq++;
->>>>>>> first commit
-=======
- public MockHttpSession() {
- cTime = System.currentTimeMillis();
- this.id = MockConstants.SESSION_ID + "-" + seq++;
->>>>>>> constantly changed by manolo
}
public Object getAttribute(String name) {
@@ -88,23 +50,8 @@ public class MockHttpSession implements
}
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
- @SuppressWarnings("rawtypes")
- public Enumeration getAttributeNames() {
-=======
- @SuppressWarnings("unchecked")
- public Enumeration getAttributeNames() {
->>>>>>> first commit
-=======
- @SuppressWarnings("unchecked")
- public Enumeration getAttributeNames() {
->>>>>>> first commit
-=======
@SuppressWarnings("rawtypes")
public Enumeration getAttributeNames() {
->>>>>>> remove warnings
return new Enumeration() {
Iterator it = attributeMap.keySet().iterator();
public boolean hasMoreElements() {
Modified: james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockHttpSessionProvider.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockHttpSessionProvider.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockHttpSessionProvider.java (original)
+++ james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockHttpSessionProvider.java Mon Sep 23 07:04:08 2013
@@ -18,70 +18,18 @@
****************************************************************/
package org.apache.hupa.server.mock;
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
import javax.servlet.http.HttpSession;
import com.google.inject.Inject;
import com.google.inject.Provider;
-=======
-=======
->>>>>>> first commit
-import com.google.inject.Inject;
-import com.google.inject.Provider;
-import com.google.inject.name.Named;
-
-import javax.servlet.http.HttpSession;
-<<<<<<< HEAD
->>>>>>> first commit
-=======
-import javax.servlet.http.HttpSession;
-
-import com.google.inject.Inject;
-import com.google.inject.Provider;
->>>>>>> constantly changed by manolo
-=======
->>>>>>> first commit
-=======
-import javax.servlet.http.HttpSession;
-
-import com.google.inject.Inject;
-import com.google.inject.Provider;
->>>>>>> constantly changed by manolo
public class MockHttpSessionProvider implements Provider<HttpSession> {
static HttpSession session = null;
@Inject
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
- public MockHttpSessionProvider() {
- if (session == null) {
- session = new MockHttpSession();
-=======
- public MockHttpSessionProvider(@Named("DefaultUserSessionId") String id) {
- if (session == null) {
- session = new MockHttpSession(id);
->>>>>>> first commit
-=======
- public MockHttpSessionProvider() {
- if (session == null) {
- session = new MockHttpSession();
->>>>>>> constantly changed by manolo
-=======
- public MockHttpSessionProvider(@Named("DefaultUserSessionId") String id) {
- if (session == null) {
- session = new MockHttpSession(id);
->>>>>>> first commit
-=======
public MockHttpSessionProvider() {
if (session == null) {
session = new MockHttpSession();
->>>>>>> constantly changed by manolo
}
}
public HttpSession get() {
Modified: james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockIMAPFolder.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockIMAPFolder.java?rev=1525515&r1=1525514&r2=1525515&view=diff
==============================================================================
--- james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockIMAPFolder.java (original)
+++ james/hupa/trunk/mock/src/main/java/org/apache/hupa/server/mock/MockIMAPFolder.java Mon Sep 23 07:04:08 2013
@@ -19,24 +19,6 @@
package org.apache.hupa.server.mock;
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-import com.sun.mail.imap.IMAPFolder;
-import com.sun.mail.imap.IMAPStore;
-
->>>>>>> first commit
-=======
->>>>>>> constantly changed by manolo
-=======
-import com.sun.mail.imap.IMAPFolder;
-import com.sun.mail.imap.IMAPStore;
-
->>>>>>> first commit
-=======
->>>>>>> constantly changed by manolo
import java.io.InputStream;
import java.util.ArrayList;
import java.util.Arrays;
@@ -44,63 +26,18 @@ import java.util.List;
import javax.mail.FetchProfile;
import javax.mail.Flags;
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
import javax.mail.Flags.Flag;
-=======
->>>>>>> first commit
-=======
-import javax.mail.Flags.Flag;
->>>>>>> constantly changed by manolo
-=======
->>>>>>> first commit
-=======
-import javax.mail.Flags.Flag;
->>>>>>> constantly changed by manolo
import javax.mail.Folder;
import javax.mail.Message;
import javax.mail.MessagingException;
import javax.mail.Session;
import javax.mail.Store;
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-import javax.mail.internet.MimeMessage;
-import javax.mail.search.SearchTerm;
-
-import com.sun.mail.imap.IMAPFolder;
-import com.sun.mail.imap.IMAPStore;
-
-=======
-=======
->>>>>>> first commit
-import javax.mail.Flags.Flag;
-import javax.mail.internet.MimeMessage;
-import javax.mail.search.SearchTerm;
-
-<<<<<<< HEAD
->>>>>>> first commit
-=======
-import javax.mail.internet.MimeMessage;
-import javax.mail.search.SearchTerm;
-
-import com.sun.mail.imap.IMAPFolder;
-import com.sun.mail.imap.IMAPStore;
-
->>>>>>> constantly changed by manolo
-=======
->>>>>>> first commit
-=======
import javax.mail.internet.MimeMessage;
import javax.mail.search.SearchTerm;
import com.sun.mail.imap.IMAPFolder;
import com.sun.mail.imap.IMAPStore;
->>>>>>> constantly changed by manolo
public class MockIMAPFolder extends IMAPFolder {
public static final char SEPARATOR = '.';
@@ -319,10 +256,6 @@ public class MockIMAPFolder extends IMAP
}
@Override
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
public synchronized Message[] search(SearchTerm search)
throws MessagingException {
checkExists();
@@ -333,37 +266,6 @@ public class MockIMAPFolder extends IMAP
}
}
return ret.toArray(new Message[0]);
-=======
-=======
->>>>>>> first commit
- public synchronized Message[] search(SearchTerm arg0)
- throws MessagingException {
- checkExists();
- return getMessages();
-<<<<<<< HEAD
->>>>>>> first commit
-=======
- public synchronized Message[] search(SearchTerm search)
- throws MessagingException {
- checkExists();
-=======
- public synchronized Message[] search(SearchTerm search)
- throws MessagingException {
- checkExists();
->>>>>>> constantly changed by manolo
- ArrayList<Message> ret = new ArrayList<Message>();
- for (Message m : messages) {
- if (search.match(m)) {
- ret.add(m);
- }
- }
- return ret.toArray(new Message[0]);
-<<<<<<< HEAD
->>>>>>> constantly changed by manolo
-=======
->>>>>>> first commit
-=======
->>>>>>> constantly changed by manolo
}
@Override
@@ -404,33 +306,11 @@ public class MockIMAPFolder extends IMAP
Message[] array = new Message[ints.length];
for (int i = 0; i < ints.length; i++) {
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
- int mInt = ints[i];
- if (mInt > messages.size() || mInt < 0) {
- throw new MessagingException();
- }
- array[i] = messages.get(ints[i]);
-=======
-=======
->>>>>>> first commit
- int mInt = ints[i] - 1;
- if (mInt > messages.size() || mInt < messages.size()) {//TODO will throw an exception when mark as read
- throw new MessagingException();
- }
- array[i] = messages.get(i);
-<<<<<<< HEAD
->>>>>>> first commit
-=======
->>>>>>> first commit
-=======
int mInt = ints[i];
if (mInt > messages.size() || mInt < 0) {
throw new MessagingException();
}
array[i] = messages.get(ints[i]);
->>>>>>> fixed issue#55 ; relative the mark as (un)read
}
return array;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org