Author: elvisisking Date: 2009-08-10 17:31:32 -0400 (Mon, 10 Aug 2009) New Revision: 1160 Added: branches/eclipse/org.jboss.dna.publish.ui.swt/dna-common-0.6-SNAPSHOT-sources.jar branches/eclipse/org.jboss.dna.publish.ui.swt/icons/views/dna_icon_16x.png branches/eclipse/org.jboss.dna.publish.ui.swt/icons/views/publish.png branches/eclipse/org.jboss.dna.publish.ui.swt/icons/views/unpublish.png branches/eclipse/org.jboss.dna.publish.ui.swt/icons/wizards/dna_wizard_banner.gif branches/eclipse/org.jboss.dna.publish.ui.swt/src/log4j.properties branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/RestClientI18n.java branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/RestClientI18n.properties branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/actions/package-info.java branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/dialogs/package-info.java branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/log/ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/log/EclipseLogger.java branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/log/EclipseLoggerFactory.java branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/log/StaticLoggerBinder.java branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/package-info.java branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/views/package-info.java branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/wizards/package-info.java Removed: branches/eclipse/org.jboss.dna.publish.ui.swt/icons/views/dna_window.png branches/eclipse/org.jboss.dna.publish.ui.swt/icons/wizards/dna_wizard_banner.png branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/I18n.java branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/i18n.properties Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/META-INF/MANIFEST.MF branches/eclipse/org.jboss.dna.publish.ui.swt/build.properties branches/eclipse/org.jboss.dna.publish.ui.swt/dna-web-jcr-rest-client-0.6-SNAPSHOT-jar-with-dependencies.jar branches/eclipse/org.jboss.dna.publish.ui.swt/dna-web-jcr-rest-client-0.6-SNAPSHOT-sources.jar branches/eclipse/org.jboss.dna.publish.ui.swt/icons/objects/server.gif branches/eclipse/org.jboss.dna.publish.ui.swt/icons/objects/workspace.gif branches/eclipse/org.jboss.dna.publish.ui.swt/plugin.xml branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/Activator.java branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/IUiConstants.java branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/Utils.java branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/actions/BasePublishingAction.java branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/actions/DeleteServerAction.java branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/actions/EditServerAction.java branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/actions/NewServerAction.java branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/actions/PublishAction.java branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/actions/UnpublishAction.java branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/dialogs/DeleteServerDialog.java branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/dialogs/PublishingResultsDialog.java branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/views/ServerContentProvider.java branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/views/ServerView.java branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/wizards/PublishOperation.java branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/wizards/PublishPage.java branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/wizards/PublishWizard.java branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/wizards/PublishingResults.java branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/wizards/ServerPage.java branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/wizards/ServerWizard.java Log: Added dna-common as a dependency so I could start using it's I18n, logging, CheckArg, and file extension mime type detector frameworks. Added or modified some images. Many javadoc changes and removed all @author tags. Added logging to the Eclipse Console view. However, the slf4j logging is not working. Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/META-INF/MANIFEST.MF =================================================================== --- branches/eclipse/org.jboss.dna.publish.ui.swt/META-INF/MANIFEST.MF 2009-08-10 18:34:03 UTC (rev 1159) +++ branches/eclipse/org.jboss.dna.publish.ui.swt/META-INF/MANIFEST.MF 2009-08-10 21:31:32 UTC (rev 1160) @@ -8,7 +8,9 @@ Bundle-Localization: plugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, - org.eclipse.core.resources + org.eclipse.core.resources, + org.eclipse.ui.console, + org.eclipse.jface.text Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Bundle-ClassPath: dna-web-jcr-rest-client-0.6-SNAPSHOT-jar-with-dependencies.jar, Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/build.properties =================================================================== --- branches/eclipse/org.jboss.dna.publish.ui.swt/build.properties 2009-08-10 18:34:03 UTC (rev 1159) +++ branches/eclipse/org.jboss.dna.publish.ui.swt/build.properties 2009-08-10 21:31:32 UTC (rev 1160) @@ -12,7 +12,8 @@ plugin.xml,\ LEGAL.txt,\ AUTHORS.txt,\ - dna-web-jcr-rest-client-0.6-SNAPSHOT-jar-with-dependencies.jar + dna-web-jcr-rest-client-0.6-SNAPSHOT-jar-with-dependencies.jar,\ + src/log4j.properties src.includes = src/,\ LEGAL.txt source.dnaPublishUi.jar = src/ Added: branches/eclipse/org.jboss.dna.publish.ui.swt/dna-common-0.6-SNAPSHOT-sources.jar =================================================================== (Binary files differ) Property changes on: branches/eclipse/org.jboss.dna.publish.ui.swt/dna-common-0.6-SNAPSHOT-sources.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/dna-web-jcr-rest-client-0.6-SNAPSHOT-jar-with-dependencies.jar =================================================================== (Binary files differ) Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/dna-web-jcr-rest-client-0.6-SNAPSHOT-sources.jar =================================================================== (Binary files differ) Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/icons/objects/server.gif =================================================================== (Binary files differ) Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/icons/objects/workspace.gif =================================================================== (Binary files differ) Copied: branches/eclipse/org.jboss.dna.publish.ui.swt/icons/views/dna_icon_16x.png (from rev 1076, branches/eclipse/org.jboss.dna.publish.ui.swt/icons/views/dna_window.png) =================================================================== (Binary files differ) Property changes on: branches/eclipse/org.jboss.dna.publish.ui.swt/icons/views/dna_icon_16x.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: branches/eclipse/org.jboss.dna.publish.ui.swt/icons/views/dna_window.png =================================================================== (Binary files differ) Added: branches/eclipse/org.jboss.dna.publish.ui.swt/icons/views/publish.png =================================================================== (Binary files differ) Property changes on: branches/eclipse/org.jboss.dna.publish.ui.swt/icons/views/publish.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/eclipse/org.jboss.dna.publish.ui.swt/icons/views/unpublish.png =================================================================== (Binary files differ) Property changes on: branches/eclipse/org.jboss.dna.publish.ui.swt/icons/views/unpublish.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/eclipse/org.jboss.dna.publish.ui.swt/icons/wizards/dna_wizard_banner.gif =================================================================== (Binary files differ) Property changes on: branches/eclipse/org.jboss.dna.publish.ui.swt/icons/wizards/dna_wizard_banner.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: branches/eclipse/org.jboss.dna.publish.ui.swt/icons/wizards/dna_wizard_banner.png =================================================================== (Binary files differ) Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/plugin.xml =================================================================== --- branches/eclipse/org.jboss.dna.publish.ui.swt/plugin.xml 2009-08-10 18:34:03 UTC (rev 1159) +++ branches/eclipse/org.jboss.dna.publish.ui.swt/plugin.xml 2009-08-10 21:31:32 UTC (rev 1160) @@ -13,7 +13,7 @@ label="%contextMenu.label" path="additions"> <separator - name="group1"> + name="dna"> </separator> </menu> @@ -22,6 +22,7 @@ id="org.jboss.dna.web.jcr.rest.client.swt.unpublishAction" label="%unpublishAction.label" class="org.jboss.dna.web.jcr.rest.client.swt.actions.UnpublishAction" + icon="icons/views/unpublish.png" menubarPath="org.jboss.dna.web.jcr.rest.client.swt.contextMenu/group1" enablesFor="*"> <enablement> @@ -41,6 +42,7 @@ id="org.jboss.dna.web.jcr.rest.client.swt.publishAction" label="%publishAction.label" class="org.jboss.dna.web.jcr.rest.client.swt.actions.PublishAction" + icon="icons/views/publish.png" menubarPath="org.jboss.dna.web.jcr.rest.client.swt.contextMenu/group1" enablesFor="*"> <enablement> Added: branches/eclipse/org.jboss.dna.publish.ui.swt/src/log4j.properties =================================================================== --- branches/eclipse/org.jboss.dna.publish.ui.swt/src/log4j.properties (rev 0) +++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/log4j.properties 2009-08-10 21:31:32 UTC (rev 1160) @@ -0,0 +1,40 @@ +# +# JBoss DNA (http://www.jboss.org/dna) +# See the COPYRIGHT.txt file distributed with this work for information +# regarding copyright ownership. Some portions may be licensed +# to Red Hat, Inc. under one or more contributor license agreements. +# See the AUTHORS.txt file in the distribution for a full listing of +# individual contributors. +# +# JBoss DNA is free software. Unless otherwise indicated, all code in JBoss DNA +# is licensed to you under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation; either version 2.1 of +# the License, or (at your option) any later version. +# +# JBoss DNA is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this software; if not, write to the Free +# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +# 02110-1301 USA, or see the FSF site: http://www.fsf.org. +# + +# Root logger option +log4j.rootLogger=TRACE, LOGFILE, CONSOLE + +log4j.appender.LOGFILE=org.apache.log4j.FileAppender +log4j.appender.LOGFILE.File=eclipse.log +log4j.appender.LOGFILE.Append=true +log4j.appender.LOGFILE.Threshold=TRACE +log4j.appender.LOGFILE.layout=org.apache.log4j.PatternLayout +log4j.appender.LOGFILE.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n + +# CONSOLE +log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender +log4j.appender.CONSOLE.Target=System.out +log4j.appender.CONSOLE.Threshold=TRACE +log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout +log4j.appender.CONSOLE.layout.ConversionPattern=- %m%n Property changes on: branches/eclipse/org.jboss.dna.publish.ui.swt/src/log4j.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/Activator.java =================================================================== --- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/Activator.java 2009-08-10 18:34:03 UTC (rev 1159) +++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/Activator.java 2009-08-10 21:31:32 UTC (rev 1160) @@ -25,6 +25,7 @@ import java.net.MalformedURLException; import java.net.URL; +import org.apache.log4j.BasicConfigurator; import org.eclipse.core.runtime.IStatus; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.resource.ImageRegistry; @@ -32,7 +33,7 @@ import org.eclipse.ui.ISharedImages; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.jboss.dna.web.jcr.rest.client.Logger; +import org.jboss.dna.common.util.CheckArg; import org.jboss.dna.web.jcr.rest.client.ServerManager; import org.jboss.dna.web.jcr.rest.client.Status; import org.jboss.dna.web.jcr.rest.client.Status.Severity; @@ -43,12 +44,12 @@ import org.osgi.framework.BundleContext; /** - * The activator class controls the plug-in life cycle. + * The <code>Activator</code> controls the plug-in life cycle, provides utility functions, and keeps track of the + * {@link ServerManager}. * - * @author Dan Florian * @since 0.6 */ -public class Activator extends AbstractUIPlugin implements IUiConstants { +public final class Activator extends AbstractUIPlugin implements IUiConstants { // =========================================================================================================================== // Class Fields @@ -95,12 +96,19 @@ // Methods // =========================================================================================================================== + /** + * @param key the plugin relative path to the image (never <code>null</code>) + * @return the image or an image indicating the requested image could not be found + * @since 0.6 + */ private ImageDescriptor createImageDescriptor( String key ) { + CheckArg.isNotNull(key, "key"); //$NON-NLS-1$ + try { URL url = new URL(getBundle().getEntry("/").toString() + key); //$NON-NLS-1$ return ImageDescriptor.createFromURL(url); } catch (final MalformedURLException e) { - log(new Status(Severity.ERROR, I18n.bind(I18n.MissingImage, key), e)); + log(new Status(Severity.ERROR, RestClientI18n.missingImage.text(key), e)); return null; } } @@ -118,23 +126,25 @@ } /** - * @param imageId the shared image identifier - * @return the image or <code>null</code> + * @param imageId the shared image identifier (never <code>null</code>) + * @return the image or an image indicating the requested image could not be found * @see ISharedImages * @since 0.6 */ public Image getSharedImage( String imageId ) { + CheckArg.isNotNull(imageId, "imageId"); //$NON-NLS-1$ Image result = PlatformUI.getWorkbench().getSharedImages().getImage(imageId); return ((result == null) ? getMissingImage() : result); } /** - * @param imageId the shared image identifier - * @return the image descriptor or <code>null</code> + * @param imageId the shared image identifier (never <code>null</code>) + * @return the image descriptor or a descriptor indicating the requested descriptor could not be found * @see ISharedImages * @since 0.6 */ public ImageDescriptor getSharedImageDescriptor( String imageId ) { + CheckArg.isNotNull(imageId, "imageId"); //$NON-NLS-1$ ImageDescriptor result = PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(imageId); if (result != null) { @@ -225,10 +235,11 @@ } /** - * @param status the status being logged + * @param status the status being logged (never <code>null</code>) * @since 0.6 */ public void log( Status status ) { + CheckArg.isNotNull(status, "status"); //$NON-NLS-1$ IStatus eclipseStatus = new org.eclipse.core.runtime.Status(Utils.convertSeverity(status.getSeverity()), IUiConstants.PLUGIN_ID, status.getMessage(), status.getException()); @@ -243,6 +254,8 @@ */ @Override public void start( BundleContext context ) throws Exception { + BasicConfigurator.configure(); + super.start(context); plugin = this; @@ -251,7 +264,7 @@ // problem restoring server registry if (!status.isOk()) { - Logger.log(getClass(), status); + log(status); } } Deleted: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/I18n.java =================================================================== --- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/I18n.java 2009-08-10 18:34:03 UTC (rev 1159) +++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/I18n.java 2009-08-10 21:31:32 UTC (rev 1160) @@ -1,138 +0,0 @@ -/* - * JBoss DNA (http://www.jboss.org/dna) - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * See the AUTHORS.txt file in the distribution for a full listing of - * individual contributors. - * - * JBoss DNA is free software. Unless otherwise indicated, all code in JBoss DNA - * is licensed to you under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * JBoss DNA is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.dna.web.jcr.rest.client.swt; - -import org.eclipse.osgi.util.NLS; - -/** - * The I18n class handles localization messages. - * - * @author Dan Florian - * @since 0.6 - */ -public final class I18n extends NLS { - - public static String BasePublishingActionPublishingWizardErrorMsg; - public static String BasePublishingActionUnpublishingWizardErrorMsg; - - public static String CollapseActionToolTip; - - public static String DeleteServerActionText; - public static String DeleteServerActionToolTip; - - public static String DeleteServerDialogErrorsOccurredMsg; - public static String DeleteServerDialogMultipleServersMsg; - public static String DeleteServerDialogOneServerMsg; - public static String DeleteServerDialogTitle; - - public static String EditServerActionText; - public static String EditServerActionToolTip; - - public static String ErrorDialogTitle; - - public static String MissingImage; - - public static String NewServerActionText; - public static String NewServerActionToolTip; - - public static String PublishingResultsPublishNotAttemptedMsg; - public static String PublishingResultsTooManyResultsMsg; - public static String PublishingResultsUnknownSeverityMsg; - public static String PublishingResultsUnpublishNotAttemptedMsg; - - public static String PublishOperationPublishTaskName; - public static String PublishOperationUnpublishTaskName; - - public static String PublishPagePublishTitle; - public static String PublishPageLocationGroupTitle; - public static String PublishPageMissingRepositoryStatusMsg; - public static String PublishPageMissingServerStatusMsg; - public static String PublishPageMissingWorkspaceStatusMsg; - public static String PublishPageNewServerButton; - public static String PublishPageNoAvailableRepositoriesStatusMsg; - public static String PublishPageNoAvailableServersStatusMsg; - public static String PublishPageNoAvailableWorkspacesStatusMsg; - public static String PublishPageNoResourcesToPublishStatusMsg; - public static String PublishPageNoResourcesToUnpublishStatusMsg; - public static String PublishPagePublishOkStatusMsg; - public static String PublishPagePublishResourcesLabel; - public static String PublishPageRecurseCheckBox; - public static String PublishPageRecurseCheckBoxToolTip; - public static String PublishPageRecurseProcessingErrorMsg; - public static String PublishPageRepositoryLabel; - public static String PublishPageRepositoryToolTip; - public static String PublishPageServerLabel; - public static String PublishPageServerToolTip; - public static String PublishPageUnpublishOkStatusMsg; - public static String PublishPageUnpublishResourcesLabel; - public static String PublishPageUnpublishTitle; - public static String PublishPageWorkspaceLabel; - public static String PublishPageWorkspacePublishToolTip; - public static String PublishPageWorkspaceUnpublishToolTip; - - public static String PublishResultsDialogErrorPublishingMsg; - public static String PublishResultsDialogErrorUnpublishingMsg; - public static String PublishResultsDialogFileHeader; - public static String PublishResultsDialogMessageHeader; - public static String PublishResultsDialogPublishMsg; - public static String PublishResultsDialogTitle; - public static String PublishResultsDialogUnpublishMsg; - - public static String PublishWizardPublishErrorMsg; - public static String PublishWizardPublishTitle; - public static String PublishWizardUnpublishTitle; - public static String PublishWizardUnpublishErrorMsg; - - public static String RefreshActionToolTip; - - public static String ServerManagerGetRepositoriesExceptionMsg; - public static String ServerManagerGetWorkspacesExceptionMsg; - - public static String ServerPageAuthenticationGroupTitle; - public static String ServerPageInvalidServerProperties; - public static String ServerPageOkStatusMsg; - public static String ServerPagePasswordLabel; - public static String ServerPagePasswordToolTip; - public static String ServerPageSavePasswordButton; - public static String ServerPageSavePasswordLabel; - public static String ServerPageSavePasswordToolTip; - public static String ServerPageTitle; - public static String ServerPageUrlLabel; - public static String ServerPageUrlToolTip; - public static String ServerPageUserLabel; - public static String ServerPageUserToolTip; - - public static String ServerViewToolTip; - - public static String ServerWizardEditServerErrorMsg; - public static String ServerWizardEditServerTitle; - public static String ServerWizardNewServerErrorMsg; - public static String ServerWizardNewServerTitle; - - static { - // load message bundle - NLS.initializeMessages(I18n.class.getPackage().getName() + ".i18n", I18n.class); //$NON-NLS-1$ - } - -} Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/IUiConstants.java =================================================================== --- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/IUiConstants.java 2009-08-10 18:34:03 UTC (rev 1159) +++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/IUiConstants.java 2009-08-10 21:31:32 UTC (rev 1160) @@ -24,7 +24,6 @@ package org.jboss.dna.web.jcr.rest.client.swt; /** - * @author Dan Florian * @since 0.6 */ public interface IUiConstants { @@ -62,20 +61,24 @@ String DELETE_SERVER_IMAGE_PATH = VIEWS_ICON_FOLDER + "delete_server.gif"; //$NON-NLS-1$ - String DNA_WINDOW_IMAGE_PATH = VIEWS_ICON_FOLDER + "dna_window.png"; //$NON-NLS-1$ + String DNA_IMAGE_16x = VIEWS_ICON_FOLDER + "dna_icon_16x.png"; //$NON-NLS-1$ String EDIT_SERVER_IMAGE_PATH = VIEWS_ICON_FOLDER + "edit_server.gif"; //$NON-NLS-1$ String NEW_SERVER_IMAGE_PATH = VIEWS_ICON_FOLDER + "new_server.gif"; //$NON-NLS-1$ + String PUBLISH_IMAGE_PATH = VIEWS_ICON_FOLDER + "publish.png"; //$NON-NLS-1$ + String REFRESH_IMAGE_PATH = VIEWS_ICON_FOLDER + "refresh.gif"; //$NON-NLS-1$ + String UNPUBLISH_IMAGE_PATH = VIEWS_ICON_FOLDER + "unpublish.png"; //$NON-NLS-1$ + // // /icons/wizards/ // String WIZARD_ICONS_FOLDER = ICON_PATH + "wizards/"; //$NON-NLS-1$ - String DNA_WIZARD_BANNER_IMAGE_PATH = WIZARD_ICONS_FOLDER + "dna_wizard_banner.png"; //$NON-NLS-1$ + String DNA_WIZARD_BANNER_IMAGE_PATH = WIZARD_ICONS_FOLDER + "dna_wizard_banner.gif"; //$NON-NLS-1$ } Copied: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/RestClientI18n.java (from rev 1141, branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/I18n.java) =================================================================== --- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/RestClientI18n.java (rev 0) +++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/RestClientI18n.java 2009-08-10 21:31:32 UTC (rev 1160) @@ -0,0 +1,152 @@ +/* + * JBoss DNA (http://www.jboss.org/dna) + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * See the AUTHORS.txt file in the distribution for a full listing of + * individual contributors. + * + * JBoss DNA is free software. Unless otherwise indicated, all code in JBoss DNA + * is licensed to you under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * JBoss DNA is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.dna.web.jcr.rest.client.swt; + +import org.jboss.dna.common.i18n.I18n; + +/** + * The <code>RestClientI18n</code> class provides localized messages. + * + * @since 0.6 + */ +public final class RestClientI18n { + + public static I18n basePublishingActionPublishingWizardErrorMsg; + public static I18n basePublishingActionUnpublishingWizardErrorMsg; + + public static I18n collapseActionToolTip; + + public static I18n deleteServerActionText; + public static I18n deleteServerActionToolTip; + + public static I18n deleteServerDialogErrorsOccurredMsg; + public static I18n deleteServerDialogMultipleServersMsg; + public static I18n deleteServerDialogOneServerMsg; + public static I18n deleteServerDialogTitle; + + public static I18n editServerActionText; + public static I18n editServerActionToolTip; + + public static I18n errorDialogTitle; + + public static I18n missingImage; + + public static I18n newServerActionText; + public static I18n newServerActionToolTip; + + public static I18n publishingResultsPublishNotAttemptedMsg; + public static I18n publishingResultsTooManyResultsMsg; + public static I18n publishingResultsUnknownSeverityMsg; + public static I18n publishingResultsUnpublishNotAttemptedMsg; + + public static I18n publishOperationConsoleName; + public static I18n publishOperationPublish; + public static I18n publishOperationPublishFile; + public static I18n publishOperationPublishFileFailed; + public static I18n publishOperationPublishTaskName; + public static I18n publishOperationUnpublish; + public static I18n publishOperationUnpublishFile; + public static I18n publishOperationUnpublishFileFailed; + public static I18n publishOperationUnpublishTaskName; + + public static I18n publishPagePublishTitle; + public static I18n publishPageLocationGroupTitle; + public static I18n publishPageMissingRepositoryStatusMsg; + public static I18n publishPageMissingServerStatusMsg; + public static I18n publishPageMissingWorkspaceStatusMsg; + public static I18n publishPageNewServerButton; + public static I18n publishPageNoAvailableRepositoriesStatusMsg; + public static I18n publishPageNoAvailableServersStatusMsg; + public static I18n publishPageNoAvailableWorkspacesStatusMsg; + public static I18n publishPageNoResourcesToPublishStatusMsg; + public static I18n publishPageNoResourcesToUnpublishStatusMsg; + public static I18n publishPagePublishOkStatusMsg; + public static I18n publishPagePublishResourcesLabel; + public static I18n publishPageRecurseCheckBox; + public static I18n publishPageRecurseCheckBoxToolTip; + public static I18n publishPageRecurseProcessingErrorMsg; + public static I18n publishPageRepositoryLabel; + public static I18n publishPageRepositoryToolTip; + public static I18n publishPageServerLabel; + public static I18n publishPageServerToolTip; + public static I18n publishPageUnpublishOkStatusMsg; + public static I18n publishPageUnpublishResourcesLabel; + public static I18n publishPageUnpublishTitle; + public static I18n publishPageWorkspaceLabel; + public static I18n publishPageWorkspacePublishToolTip; + public static I18n publishPageWorkspaceUnpublishToolTip; + + public static I18n publishResultsDialogErrorIncompletePublishingMsg; + public static I18n publishResultsDialogErrorIncompleteUnpublishingMsg; + public static I18n publishResultsDialogErrorPublishingMsg; + public static I18n publishResultsDialogErrorUnpublishingMsg; + public static I18n publishResultsDialogFileHeader; + public static I18n publishResultsDialogIncompletePublishMsg; + public static I18n publishResultsDialogIncompleteUnpublishMsg; + public static I18n publishResultsDialogMessageHeader; + public static I18n publishResultsDialogPublishMsg; + public static I18n publishResultsDialogStatisticsMsg; + public static I18n publishResultsDialogTitle; + public static I18n publishResultsDialogUnpublishMsg; + + public static I18n publishWizardPublishErrorMsg; + public static I18n publishWizardPublishTitle; + public static I18n publishWizardUnpublishTitle; + public static I18n publishWizardUnpublishErrorMsg; + + public static I18n refreshActionToolTip; + + public static I18n serverManagerGetRepositoriesExceptionMsg; + public static I18n serverManagerGetWorkspacesExceptionMsg; + + public static I18n serverPageAuthenticationGroupTitle; + public static I18n serverPageInvalidServerProperties; + public static I18n serverPageOkStatusMsg; + public static I18n serverPagePasswordLabel; + public static I18n serverPagePasswordToolTip; + public static I18n serverPageSavePasswordButton; + public static I18n serverPageSavePasswordLabel; + public static I18n serverPageSavePasswordToolTip; + public static I18n serverPageTitle; + public static I18n serverPageUrlLabel; + public static I18n serverPageUrlToolTip; + public static I18n serverPageUserLabel; + public static I18n serverPageUserToolTip; + + public static I18n serverViewToolTip; + + public static I18n serverWizardEditServerErrorMsg; + public static I18n serverWizardEditServerTitle; + public static I18n serverWizardNewServerErrorMsg; + public static I18n serverWizardNewServerTitle; + + static { + try { + I18n.initialize(RestClientI18n.class); + } catch (Exception e) { + System.err.println(e); + } + } + +} Property changes on: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/RestClientI18n.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/RestClientI18n.properties (from rev 1141, branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/i18n.properties) =================================================================== --- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/RestClientI18n.properties (rev 0) +++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/RestClientI18n.properties 2009-08-10 21:31:32 UTC (rev 1160) @@ -0,0 +1,131 @@ +# +# JBoss DNA (http://www.jboss.org/dna) +# See the COPYRIGHT.txt file distributed with this work for information +# regarding copyright ownership. Some portions may be licensed +# to Red Hat, Inc. under one or more contributor license agreements. +# See the AUTHORS.txt file in the distribution for a full listing of +# individual contributors. +# +# JBoss DNA is free software. Unless otherwise indicated, all code in JBoss DNA +# is licensed to you under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation; either version 2.1 of +# the License, or (at your option) any later version. +# +# JBoss DNA is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this software; if not, write to the Free +# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +# 02110-1301 USA, or see the FSF site: http://www.fsf.org. +# +basePublishingActionPublishingWizardErrorMsg = Unexpected error running the publishing wizard. See log for more details. +basePublishingActionUnpublishingWizardErrorMsg = Unexpected error running the unpublishing wizard. See log for more details. + +collapseActionToolTip = Collapse All + +deleteServerActionText = Delete Server +deleteServerActionToolTip = Delete server from the server registry + +deleteServerDialogErrorsOccurredMsg = There were errors deleting servers from the server registry. See log for more details. +deleteServerDialogMultipleServersMsg = Are you sure you want to delete these {0} servers? +deleteServerDialogOneServerMsg = Are you sure you want to delete the "{0}" server? +deleteServerDialogTitle = Confirm Delete Server + +editServerActionText = Server Properties +editServerActionToolTip = Edit server properties + +errorDialogTitle = Error + +missingImage = The following image cannot be found "{0}" + +newServerActionText = New Server +newServerActionToolTip = Create a new server + +publishingResultsPublishNotAttemptedMsg = Publishing not attempted +publishingResultsTooManyResultsMsg = Adding a status to the results failed since there is not enough files involved in the publishing operation. +publishingResultsUnknownSeverityMsg = "{0}" is an unknown status severity +publishingResultsUnpublishNotAttemptedMsg = Unpublishing not attempted + +publishOperationConsoleName = DNA +publishOperationPublish = DNA publish to server "{0}", repository "{1}", workspace "{2}" +publishOperationPublishFile = \t+ Published file "{0}" to location "{1}" +publishOperationPublishFileFailed = \t* ERROR publishing file "{0}" to location "{1}" +publishOperationPublishTaskName = Publishing resources +publishOperationUnpublish = DNA unpublish from server "{0}", repository "{1}", workspace "{2}" +publishOperationUnpublishFile = \t- Unpublished file "{0}" from location "{1}" +publishOperationUnpublishFileFailed = \t* ERROR unpublished file "{0}" from location "{1}" +publishOperationUnpublishTaskName = Unpublishing resources + +publishPagePublishTitle = Publish the selected resources +publishPageLocationGroupTitle = Location +publishPageMissingRepositoryStatusMsg = A repository must be selected +publishPageMissingServerStatusMsg = A server must be selected +publishPageMissingWorkspaceStatusMsg = A workspace must be selected +publishPageNewServerButton = New... +publishPageNoAvailableRepositoriesStatusMsg = There are no repositories available on that server +publishPageNoAvailableServersStatusMsg = A server must be created first +publishPageNoAvailableWorkspacesStatusMsg = There are no workspaces available on that server and repository +publishPageNoResourcesToPublishStatusMsg = There are no files that can be published +publishPageNoResourcesToUnpublishStatusMsg = There are no files that can be unpublished +publishPagePublishOkStatusMsg = Choose the server, repository, and workspace where the selected resources will be published. Then click "Finish" to execute the publish operation. +publishPagePublishResourcesLabel = These resources will be uploaded to the specified DNA workspace: +publishPageRecurseCheckBox = Recurse folders and projects +publishPageRecurseCheckBoxToolTip = Add all files under folders recursively under selected projects and folders +publishPageRecurseProcessingErrorMsg = Unexpected error processing resources. See log for more details. +publishPageRepositoryLabel = Repository: +publishPageRepositoryToolTip = The repository where the workspace is located +publishPageServerLabel = Server: +publishPageServerToolTip = The server where the repository is located +publishPageUnpublishOkStatusMsg = Choose the server, repository, and workspace where the selected resources will be unpublished. Then click "Finish" to execute the unpublish operation. +publishPageUnpublishResourcesLabel = These resources will be removed from the specified DNA workspace: +publishPageUnpublishTitle = Unpublish the selected resources +publishPageWorkspaceLabel = Workspace: +publishPageWorkspacePublishToolTip = The workspace where the resources are being published +publishPageWorkspaceUnpublishToolTip = The workspace where the resources are being unpublished + +publishResultsDialogErrorIncompletePublishingMsg = There was a problem publishing some or all of the files. The publishing operation did not complete. See results below and the log for more details. Error message: "{0}." +publishResultsDialogErrorIncompleteUnpublishingMsg = There was a problem publishing some or all of the files. The unpublishing operation did not complete. See results below and the log for more details. Error message: "{0}." +publishResultsDialogErrorPublishingMsg = There was a problem publishing some or all of the files. See results below and the log for more details. Error message: "{0}." +publishResultsDialogErrorUnpublishingMsg = There was a problem publishing some or all of the files. See results below and the log for more details. Error message: "{0}." +publishResultsDialogFileHeader = File +publishResultsDialogIncompletePublishMsg = {0} file(s) were successfully published (uploaded) to the DNA repository workspace but the publishing operation did not complete. +publishResultsDialogIncompleteUnpublishMsg = {0} file(s) were successfully unpublished (removed) from the DNA repository workspace but the unpublishing operation did not complete. +publishResultsDialogMessageHeader = Message +publishResultsDialogPublishMsg = {0} file(s) were successfully published (uploaded) to the DNA repository workspace. +publishResultsDialogStatisticsMsg = There were {1} error(s), {2} info(s), and {3} warning(s). +publishResultsDialogTitle = Results +publishResultsDialogUnpublishMsg = {0} file(s) were successfully unpublished (removed) from the DNA repository workspace. + +publishWizardPublishErrorMsg = Error Publishing +publishWizardPublishTitle = Publish +publishWizardUnpublishErrorMsg = Error Unpublishing +publishWizardUnpublishTitle = Unpublish + +refreshActionToolTip = Refresh + +serverManagerGetRepositoriesExceptionMsg = There was a problem obtaining repositories for the server "{0}." +serverManagerGetWorkspacesExceptionMsg = There was a problem obtaining workspaces for repository "{0}." + +serverPageAuthenticationGroupTitle = Authentication +serverPageInvalidServerProperties = Cannot construct a server because all server properties are not valid +serverPageOkStatusMsg = Define the server information where the DNA repositories are located. +serverPagePasswordLabel = Password: +serverPagePasswordToolTip = The password used to authenticate the user when connecting to the server +serverPageSavePasswordButton = Save password +serverPageSavePasswordLabel = Saved secret data is stored on your computer in a file that's difficult, but not impossible, for an intruder to read. +serverPageSavePasswordToolTip = Indicates if the clear text password should be stored on the local file system +serverPageTitle = Enter Server Information +serverPageUrlLabel = URL: +serverPageUrlToolTip = The URL used to connect to the server +serverPageUserLabel = User: +serverPageUserToolTip = The user login used when connecting to the server + +serverViewToolTip = Manages the DNA server registry + +serverWizardEditServerErrorMsg = There were errors editing a server. See log for more details. +serverWizardEditServerTitle = Edit Server +serverWizardNewServerErrorMsg = There were errors creating a new server. See log for more details. +serverWizardNewServerTitle = New Server Property changes on: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/RestClientI18n.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/Utils.java =================================================================== --- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/Utils.java 2009-08-10 18:34:03 UTC (rev 1159) +++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/Utils.java 2009-08-10 21:31:32 UTC (rev 1160) @@ -33,7 +33,6 @@ import org.jboss.dna.web.jcr.rest.client.Status.Severity; /** - * @author Dan Florian * @since 0.6 */ public final class Utils { Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/actions/BasePublishingAction.java =================================================================== --- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/actions/BasePublishingAction.java 2009-08-10 18:34:03 UTC (rev 1159) +++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/actions/BasePublishingAction.java 2009-08-10 21:31:32 UTC (rev 1160) @@ -23,7 +23,7 @@ */ package org.jboss.dna.web.jcr.rest.client.swt.actions; -import static org.jboss.dna.web.jcr.rest.client.swt.IUiConstants.DNA_WINDOW_IMAGE_PATH; +import static org.jboss.dna.web.jcr.rest.client.swt.IUiConstants.DNA_IMAGE_16x; import java.util.Collections; import java.util.List; import org.eclipse.core.resources.IResource; @@ -39,12 +39,11 @@ import org.jboss.dna.web.jcr.rest.client.Status; import org.jboss.dna.web.jcr.rest.client.Status.Severity; import org.jboss.dna.web.jcr.rest.client.swt.Activator; -import org.jboss.dna.web.jcr.rest.client.swt.I18n; +import org.jboss.dna.web.jcr.rest.client.swt.RestClientI18n; import org.jboss.dna.web.jcr.rest.client.swt.wizards.PublishWizard; import org.jboss.dna.web.jcr.rest.client.swt.wizards.PublishOperation.Type; /** - * @author Dan Florian * @since 0.6 */ public abstract class BasePublishingAction implements IObjectActionDelegate { @@ -117,7 +116,7 @@ @Override protected void configureShell( Shell newShell ) { super.configureShell(newShell); - newShell.setImage(Activator.getDefault().getImage(DNA_WINDOW_IMAGE_PATH)); + newShell.setImage(Activator.getDefault().getImage(DNA_IMAGE_16x)); } }; @@ -126,13 +125,13 @@ String msg = null; if (this.type == Type.PUBLISH) { - msg = I18n.BasePublishingActionPublishingWizardErrorMsg; + msg = RestClientI18n.basePublishingActionPublishingWizardErrorMsg.text(); } else { - msg = I18n.BasePublishingActionUnpublishingWizardErrorMsg; + msg = RestClientI18n.basePublishingActionUnpublishingWizardErrorMsg.text(); } Activator.getDefault().log(new Status(Severity.ERROR, msg, e)); - MessageDialog.openError(this.shell, I18n.ErrorDialogTitle, msg); + MessageDialog.openError(this.shell, RestClientI18n.errorDialogTitle.text(), msg); } } Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/actions/DeleteServerAction.java =================================================================== --- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/actions/DeleteServerAction.java 2009-08-10 18:34:03 UTC (rev 1159) +++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/actions/DeleteServerAction.java 2009-08-10 21:31:32 UTC (rev 1160) @@ -36,13 +36,12 @@ import org.jboss.dna.web.jcr.rest.client.Status; import org.jboss.dna.web.jcr.rest.client.domain.Server; import org.jboss.dna.web.jcr.rest.client.swt.Activator; -import org.jboss.dna.web.jcr.rest.client.swt.I18n; +import org.jboss.dna.web.jcr.rest.client.swt.RestClientI18n; import org.jboss.dna.web.jcr.rest.client.swt.dialogs.DeleteServerDialog; /** * The DeleteServerAction deletes one or more servers from the server registry. * - * @author Dan Florian * @since 0.6 */ public final class DeleteServerAction extends BaseSelectionListenerAction { @@ -83,8 +82,8 @@ */ public DeleteServerAction( Shell shell, ServerManager serverManager ) { - super(I18n.DeleteServerActionText); - setToolTipText(I18n.DeleteServerActionToolTip); + super(RestClientI18n.deleteServerActionText.text()); + setToolTipText(RestClientI18n.deleteServerActionToolTip.text()); setImageDescriptor(Activator.getDefault().getImageDescriptor(DELETE_SERVER_IMAGE_PATH)); setEnabled(false); @@ -123,7 +122,9 @@ } if (errorsOccurred) { - MessageDialog.openError(this.shell, I18n.ErrorDialogTitle, I18n.DeleteServerDialogErrorsOccurredMsg); + MessageDialog.openError(this.shell, + RestClientI18n.errorDialogTitle.text(), + RestClientI18n.deleteServerDialogErrorsOccurredMsg.text()); } } } Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/actions/EditServerAction.java =================================================================== --- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/actions/EditServerAction.java 2009-08-10 18:34:03 UTC (rev 1159) +++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/actions/EditServerAction.java 2009-08-10 21:31:32 UTC (rev 1160) @@ -23,7 +23,7 @@ */ package org.jboss.dna.web.jcr.rest.client.swt.actions; -import static org.jboss.dna.web.jcr.rest.client.swt.IUiConstants.DNA_WINDOW_IMAGE_PATH; +import static org.jboss.dna.web.jcr.rest.client.swt.IUiConstants.DNA_IMAGE_16x; import static org.jboss.dna.web.jcr.rest.client.swt.IUiConstants.EDIT_SERVER_IMAGE_PATH; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.wizard.WizardDialog; @@ -32,11 +32,12 @@ import org.jboss.dna.web.jcr.rest.client.ServerManager; import org.jboss.dna.web.jcr.rest.client.domain.Server; import org.jboss.dna.web.jcr.rest.client.swt.Activator; -import org.jboss.dna.web.jcr.rest.client.swt.I18n; +import org.jboss.dna.web.jcr.rest.client.swt.RestClientI18n; import org.jboss.dna.web.jcr.rest.client.swt.wizards.ServerWizard; /** - * @author Dan Florian + * The <code>EditServerAction</code> runs a UI that allows {@link Server server} properties to be changed. + * * @since 0.6 */ public final class EditServerAction extends BaseSelectionListenerAction { @@ -77,8 +78,8 @@ */ public EditServerAction( Shell shell, ServerManager serverManager ) { - super(I18n.EditServerActionText); - setToolTipText(I18n.EditServerActionToolTip); + super(RestClientI18n.editServerActionText.text()); + setToolTipText(RestClientI18n.editServerActionToolTip.text()); setImageDescriptor(Activator.getDefault().getImageDescriptor(EDIT_SERVER_IMAGE_PATH)); setEnabled(false); @@ -103,10 +104,10 @@ @Override protected void configureShell( Shell newShell ) { super.configureShell(newShell); - newShell.setImage(Activator.getDefault().getImage(DNA_WINDOW_IMAGE_PATH)); + newShell.setImage(Activator.getDefault().getImage(DNA_IMAGE_16x)); } }; - + dialog.open(); } Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/actions/NewServerAction.java =================================================================== --- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/actions/NewServerAction.java 2009-08-10 18:34:03 UTC (rev 1159) +++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/actions/NewServerAction.java 2009-08-10 21:31:32 UTC (rev 1160) @@ -23,18 +23,20 @@ */ package org.jboss.dna.web.jcr.rest.client.swt.actions; -import static org.jboss.dna.web.jcr.rest.client.swt.IUiConstants.DNA_WINDOW_IMAGE_PATH; +import static org.jboss.dna.web.jcr.rest.client.swt.IUiConstants.DNA_IMAGE_16x; import static org.jboss.dna.web.jcr.rest.client.swt.IUiConstants.NEW_SERVER_IMAGE_PATH; import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.actions.BaseSelectionListenerAction; import org.jboss.dna.web.jcr.rest.client.ServerManager; +import org.jboss.dna.web.jcr.rest.client.domain.Server; import org.jboss.dna.web.jcr.rest.client.swt.Activator; -import org.jboss.dna.web.jcr.rest.client.swt.I18n; +import org.jboss.dna.web.jcr.rest.client.swt.RestClientI18n; import org.jboss.dna.web.jcr.rest.client.swt.wizards.ServerWizard; /** - * @author Dan Florian + * The <code>NewServerAction</code> runs a UI that allows the user to create a new {@link Server server}. + * * @since 0.6 */ public final class NewServerAction extends BaseSelectionListenerAction { @@ -68,8 +70,8 @@ */ public NewServerAction( Shell shell, ServerManager serverManager ) { - super(I18n.NewServerActionText); - setToolTipText(I18n.NewServerActionToolTip); + super(RestClientI18n.newServerActionText.text()); + setToolTipText(RestClientI18n.newServerActionToolTip.text()); setImageDescriptor(Activator.getDefault().getImageDescriptor(NEW_SERVER_IMAGE_PATH)); this.shell = shell; @@ -93,7 +95,7 @@ @Override protected void configureShell( Shell newShell ) { super.configureShell(newShell); - newShell.setImage(Activator.getDefault().getImage(DNA_WINDOW_IMAGE_PATH)); + newShell.setImage(Activator.getDefault().getImage(DNA_IMAGE_16x)); } }; Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/actions/PublishAction.java =================================================================== --- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/actions/PublishAction.java 2009-08-10 18:34:03 UTC (rev 1159) +++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/actions/PublishAction.java 2009-08-10 21:31:32 UTC (rev 1160) @@ -26,9 +26,9 @@ import org.jboss.dna.web.jcr.rest.client.swt.wizards.PublishOperation.Type; /** - * The PublishAction controls the publishing of one or more {@link org.eclipse.core.resources.IResource}s to a DNA repository. + * The <code>PublishAction</code> controls the publishing of one or more {@link org.eclipse.core.resources.IResource}s to a DNA + * repository. * - * @author Dan Florian * @since 0.6 */ public final class PublishAction extends BasePublishingAction { Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/actions/UnpublishAction.java =================================================================== --- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/actions/UnpublishAction.java 2009-08-10 18:34:03 UTC (rev 1159) +++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/actions/UnpublishAction.java 2009-08-10 21:31:32 UTC (rev 1160) @@ -26,10 +26,9 @@ import org.jboss.dna.web.jcr.rest.client.swt.wizards.PublishOperation.Type; /** - * The UnpublishAction controls the unpublishing of on or more {@link org.eclipse.core.resources.IResource}s from a DNA - * repository. + * The <code>UnpublishAction</code> controls the unpublishing of one or more {@link org.eclipse.core.resources.IResource}s from a + * DNA repository. * - * @author Dan Florian * @since 0.6 */ public final class UnpublishAction extends BasePublishingAction { Added: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/actions/package-info.java =================================================================== --- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/actions/package-info.java (rev 0) +++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/actions/package-info.java 2009-08-10 21:31:32 UTC (rev 1160) @@ -0,0 +1,27 @@ +/* + * JBoss DNA (http://www.jboss.org/dna) + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * See the AUTHORS.txt file in the distribution for a full listing of + * individual contributors. + * + * JBoss DNA is free software. Unless otherwise indicated, all code in JBoss DNA + * is licensed to you under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * JBoss DNA is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +/** + * The JBoss DNA REST Client Eclipse actions package defines the actions used to publish, unpublish, and manage the server registry. + */ +package org.jboss.dna.web.jcr.rest.client.swt.actions; \ No newline at end of file Property changes on: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/actions/package-info.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/dialogs/DeleteServerDialog.java =================================================================== --- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/dialogs/DeleteServerDialog.java 2009-08-10 18:34:03 UTC (rev 1159) +++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/dialogs/DeleteServerDialog.java 2009-08-10 21:31:32 UTC (rev 1160) @@ -23,11 +23,10 @@ */ package org.jboss.dna.web.jcr.rest.client.swt.dialogs; -import static org.jboss.dna.web.jcr.rest.client.swt.IUiConstants.DNA_WINDOW_IMAGE_PATH; +import static org.jboss.dna.web.jcr.rest.client.swt.IUiConstants.DNA_IMAGE_16x; import java.util.Collection; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Composite; @@ -38,15 +37,14 @@ import org.jboss.dna.web.jcr.rest.client.domain.IDnaObject; import org.jboss.dna.web.jcr.rest.client.domain.Server; import org.jboss.dna.web.jcr.rest.client.swt.Activator; -import org.jboss.dna.web.jcr.rest.client.swt.I18n; +import org.jboss.dna.web.jcr.rest.client.swt.RestClientI18n; /** * The <code>DeleteServerDialog</code> class provides a UI for deleting a {@link Server server}. * - * @author Dan Florian * @since 0.6 */ -public class DeleteServerDialog extends MessageDialog { +public final class DeleteServerDialog extends MessageDialog { // =========================================================================================================================== // Fields @@ -70,10 +68,10 @@ */ public DeleteServerDialog( Shell parentShell, Collection<Server> serversBeingDeleted ) { - super(parentShell, I18n.DeleteServerDialogTitle, Activator.getDefault().getImage(DNA_WINDOW_IMAGE_PATH), null, + super(parentShell, RestClientI18n.deleteServerDialogTitle.text(), Activator.getDefault().getImage(DNA_IMAGE_16x), null, MessageDialog.QUESTION, new String[] {IDialogConstants.OK_LABEL, IDialogConstants.CANCEL_LABEL}, 0); this.serversBeingDeleted = serversBeingDeleted; - + // make sure dialog is resizable setShellStyle(getShellStyle() | SWT.RESIZE); } @@ -97,9 +95,9 @@ if (this.serversBeingDeleted.size() == 1) { IDnaObject server = this.serversBeingDeleted.iterator().next(); - msg = NLS.bind(I18n.DeleteServerDialogOneServerMsg, server.getName()); + msg = RestClientI18n.deleteServerDialogOneServerMsg.text(server.getName()); } else { - msg = NLS.bind(I18n.DeleteServerDialogMultipleServersMsg, this.serversBeingDeleted.size()); + msg = RestClientI18n.deleteServerDialogMultipleServersMsg.text(this.serversBeingDeleted.size()); } this.message = msg; Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/dialogs/PublishingResultsDialog.java =================================================================== --- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/dialogs/PublishingResultsDialog.java 2009-08-10 18:34:03 UTC (rev 1159) +++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/dialogs/PublishingResultsDialog.java 2009-08-10 21:31:32 UTC (rev 1160) @@ -24,7 +24,7 @@ package org.jboss.dna.web.jcr.rest.client.swt.dialogs; import static org.jboss.dna.web.jcr.rest.client.swt.IUiConstants.CHECKMARK_IMAGE_PATH; -import static org.jboss.dna.web.jcr.rest.client.swt.IUiConstants.DNA_WINDOW_IMAGE_PATH; +import static org.jboss.dna.web.jcr.rest.client.swt.IUiConstants.DNA_IMAGE_16x; import java.util.List; import org.eclipse.core.resources.IFile; import org.eclipse.jface.dialogs.IDialogConstants; @@ -35,29 +35,29 @@ import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.viewers.Viewer; import org.eclipse.swt.SWT; +import org.eclipse.swt.custom.StyledText; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableColumn; import org.jboss.dna.web.jcr.rest.client.Status; -import org.jboss.dna.web.jcr.rest.client.domain.Server; import org.jboss.dna.web.jcr.rest.client.swt.Activator; -import org.jboss.dna.web.jcr.rest.client.swt.I18n; +import org.jboss.dna.web.jcr.rest.client.swt.RestClientI18n; import org.jboss.dna.web.jcr.rest.client.swt.Utils; import org.jboss.dna.web.jcr.rest.client.swt.wizards.PublishOperation; import org.jboss.dna.web.jcr.rest.client.swt.wizards.PublishingResults; /** - * The <code>DeleteServerDialog</code> class provides a UI for deleting a {@link Server server}. + * The <code>PublishingResultsDialog</code> displays the results of a publishing operation. * - * @author Dan Florian * @since 0.6 */ -public class PublishingResultsDialog extends MessageDialog { +public final class PublishingResultsDialog extends MessageDialog { // =========================================================================================================================== // Constants @@ -113,7 +113,7 @@ */ public PublishingResultsDialog( Shell parentShell, PublishingResults results ) { - super(parentShell, I18n.PublishResultsDialogTitle, Activator.getDefault().getImage(DNA_WINDOW_IMAGE_PATH), null, + super(parentShell, RestClientI18n.publishResultsDialogTitle.text(), Activator.getDefault().getImage(DNA_IMAGE_16x), null, MessageDialog.INFORMATION, new String[] {IDialogConstants.OK_LABEL}, 0); this.results = results; @@ -130,7 +130,7 @@ public PublishingResultsDialog( Shell parentShell, PublishingResults results, Throwable error ) { - super(parentShell, I18n.PublishResultsDialogTitle, Activator.getDefault().getImage(DNA_WINDOW_IMAGE_PATH), null, + super(parentShell, RestClientI18n.publishResultsDialogTitle.text(), Activator.getDefault().getImage(DNA_IMAGE_16x), null, MessageDialog.ERROR, new String[] {IDialogConstants.OK_LABEL}, 0); this.results = results; this.error = error; @@ -154,15 +154,37 @@ super.configureShell(shell); // now set message - Object[] counts = new Object[] {this.results.getOksCount(), this.results.getErrorCount(), this.results.getInfoCount(), - this.results.getWarningsCount()}; + int successCount = this.results.getFiles().size() - this.results.getErrorCount(); + boolean completed = this.results.isComplete(); if (this.results.getType() == PublishOperation.Type.PUBLISH) { - this.message = ((this.error == null) ? I18n.bind(I18n.PublishResultsDialogPublishMsg, counts) : I18n.bind(I18n.PublishResultsDialogErrorPublishingMsg, - this.error.getLocalizedMessage())); + if (completed) { + if ((this.error == null)) { + this.message = RestClientI18n.publishResultsDialogPublishMsg.text(successCount); + } else { + this.message = RestClientI18n.publishResultsDialogErrorPublishingMsg.text(this.error.getLocalizedMessage()); + } + } else { + if ((this.error == null)) { + this.message = RestClientI18n.publishResultsDialogIncompletePublishMsg.text(successCount); + } else { + this.message = RestClientI18n.publishResultsDialogErrorIncompletePublishingMsg.text(this.error.getLocalizedMessage()); + } + } } else { - this.message = ((this.error == null) ? I18n.bind(I18n.PublishResultsDialogUnpublishMsg, counts) : I18n.bind(I18n.PublishResultsDialogErrorUnpublishingMsg, - this.error.getLocalizedMessage())); + if (completed) { + if ((this.error == null)) { + this.message = RestClientI18n.publishResultsDialogUnpublishMsg.text(successCount); + } else { + this.message = RestClientI18n.publishResultsDialogErrorUnpublishingMsg.text(this.error.getLocalizedMessage()); + } + } else { + if ((this.error == null)) { + this.message = RestClientI18n.publishResultsDialogIncompleteUnpublishMsg.text(successCount); + } else { + this.message = RestClientI18n.publishResultsDialogErrorIncompleteUnpublishingMsg.text(this.error.getLocalizedMessage()); + } + } } } @@ -203,13 +225,13 @@ table.setLinesVisible(true); TableColumn col = new TableColumn(table, SWT.LEFT); - col.setText(I18n.PublishResultsDialogFileHeader); + col.setText(RestClientI18n.publishResultsDialogFileHeader.text()); col = new TableColumn(table, SWT.CENTER); col.setResizable(false); col = new TableColumn(table, SWT.LEFT); - col.setText(I18n.PublishResultsDialogMessageHeader); + col.setText(RestClientI18n.publishResultsDialogMessageHeader.text()); // populate the table viewer.setInput(this); @@ -220,6 +242,21 @@ column.setWidth(column.getWidth() + 2); } + // add statistics label + StyledText st = new StyledText(parent, SWT.READ_ONLY | SWT.MULTI | SWT.NO_FOCUS | SWT.WRAP); + st.setBackground(Display.getDefault().getSystemColor(SWT.COLOR_WIDGET_BACKGROUND)); + st.setCaret(null); + gd = new GridData(GridData.FILL_BOTH); + gd.grabExcessVerticalSpace = false; + gd.horizontalIndent = ((GridLayout)pnl.getLayout()).horizontalSpacing * 5; + st.setLayoutData(gd); + + // set message + Object[] counts = new Object[] {this.results.getOksCount(), this.results.getErrorCount(), this.results.getInfoCount(), + this.results.getWarningsCount()}; + String msg = RestClientI18n.publishResultsDialogStatisticsMsg.text(counts); + st.setText(msg); + return pnl; } @@ -248,7 +285,6 @@ * The <code>ResultsProvider</code> class is the label provider and content provider for the table that is shown in the * dialog. * - * @author Dan Florian * @since 0.6 */ class ResultsProvider extends LabelProvider implements IStructuredContentProvider, ITableLabelProvider { Added: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/dialogs/package-info.java =================================================================== --- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/dialogs/package-info.java (rev 0) +++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/dialogs/package-info.java 2009-08-10 21:31:32 UTC (rev 1160) @@ -0,0 +1,28 @@ +/* + * JBoss DNA (http://www.jboss.org/dna) + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * See the AUTHORS.txt file in the distribution for a full listing of + * individual contributors. + * + * JBoss DNA is free software. Unless otherwise indicated, all code in JBoss DNA + * is licensed to you under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * JBoss DNA is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +/** + * The JBoss DNA REST Client Eclipse dialogs package defines the Eclipse dialogs used to publish, unpublish, and manage the + * server registry. + */ +package org.jboss.dna.web.jcr.rest.client.swt.dialogs; \ No newline at end of file Property changes on: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/dialogs/package-info.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/i18n.properties =================================================================== --- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/i18n.properties 2009-08-10 18:34:03 UTC (rev 1159) +++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/i18n.properties 2009-08-10 21:31:32 UTC (rev 1160) @@ -1,119 +0,0 @@ -# -# JBoss DNA (http://www.jboss.org/dna) -# See the COPYRIGHT.txt file distributed with this work for information -# regarding copyright ownership. Some portions may be licensed -# to Red Hat, Inc. under one or more contributor license agreements. -# See the AUTHORS.txt file in the distribution for a full listing of -# individual contributors. -# -# JBoss DNA is free software. Unless otherwise indicated, all code in JBoss DNA -# is licensed to you under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation; either version 2.1 of -# the License, or (at your option) any later version. -# -# JBoss DNA is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this software; if not, write to the Free -# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -# 02110-1301 USA, or see the FSF site: http://www.fsf.org. -# -BasePublishingActionPublishingWizardErrorMsg = Unexpected error running the publishing wizard. See log for more details. -BasePublishingActionUnpublishingWizardErrorMsg = Unexpected error running the unpublishing wizard. See log for more details. - -CollapseActionToolTip = Collapse All - -DeleteServerActionText = Delete Server -DeleteServerActionToolTip = Delete server from the server registry - -DeleteServerDialogErrorsOccurredMsg = There were errors deleting servers from the server registry. See log for more details. -DeleteServerDialogMultipleServersMsg = Are you sure you want to delete these {0} servers? -DeleteServerDialogOneServerMsg = Are you sure you want to delete the "{0}" server? -DeleteServerDialogTitle = Confirm Delete Server - -EditServerActionText = Server Properties -EditServerActionToolTip = Edit server properties - -ErrorDialogTitle = Error - -MissingImage = The following image cannot be found "{0}" - -NewServerActionText = New Server -NewServerActionToolTip = Create a new server - -PublishingResultsPublishNotAttemptedMsg = Publishing not attempted -PublishingResultsTooManyResultsMsg = Adding a status to the results failed since there is not enough files involved in the publishing operation. -PublishingResultsUnknownSeverityMsg = "{0}" is an unknown status severity -PublishingResultsUnpublishNotAttemptedMsg = Unpublishing not attempted - -PublishOperationPublishTaskName = Publishing resources -PublishOperationUnpublishTaskName = Unpublishing resources - -PublishPagePublishTitle = Publish the selected resources -PublishPageLocationGroupTitle = Location -PublishPageMissingRepositoryStatusMsg = A repository must be selected -PublishPageMissingServerStatusMsg = A server must be selected -PublishPageMissingWorkspaceStatusMsg = A workspace must be selected -PublishPageNewServerButton = New... -PublishPageNoAvailableRepositoriesStatusMsg = There are no repositories available on that server -PublishPageNoAvailableServersStatusMsg = A server must be created first -PublishPageNoAvailableWorkspacesStatusMsg = There are no workspaces available on that server and repository -PublishPageNoResourcesToPublishStatusMsg = There are no files that can be published -PublishPageNoResourcesToUnpublishStatusMsg = There are no files that can be unpublished -PublishPagePublishOkStatusMsg = Choose the server, repository, and workspace where the selected resources will be published. Then click "Finish" to execute the publish operation. -PublishPagePublishResourcesLabel = These resources will be published to the specified DNA repository: -PublishPageRecurseCheckBox = Recurse folders and projects -PublishPageRecurseCheckBoxToolTip = Add all files under folders recursively under selected projects and folders -PublishPageRecurseProcessingErrorMsg = Unexpected error processing resources. See log for more details. -PublishPageRepositoryLabel = Repository: -PublishPageRepositoryToolTip = The repository where the workspace is located -PublishPageServerLabel = Server: -PublishPageServerToolTip = The server where the repository is located -PublishPageUnpublishOkStatusMsg = Choose the server, repository, and workspace where the selected resources will be unpublished. Then click "Finish" to execute the unpublish operation. -PublishPageUnpublishResourcesLabel = These resources will be unpublished from the specified DNA repository: -PublishPageUnpublishTitle = Unpublish the selected resources -PublishPageWorkspaceLabel = Workspace: -PublishPageWorkspacePublishToolTip = The workspace where the resources are being published -PublishPageWorkspaceUnpublishToolTip = The workspace where the resources are being unpublished - -PublishResultsDialogErrorPublishingMsg = There was a problem publishing some or all of the files. See results below and the log for more details. Error message: "{0}." -PublishResultsDialogErrorUnpublishingMsg = There was a problem publishing some or all of the files. See results below and the log for more details. Error message: "{0}." -PublishResultsDialogFileHeader = File -PublishResultsDialogMessageHeader = Message -PublishResultsDialogPublishMsg = The operation completed with {0} file(s) being published. There were {1} error(s), {2} info(s), and {3} warning(s). -PublishResultsDialogTitle = Results -PublishResultsDialogUnpublishMsg = The operation completed with {0} file(s) being unpublished. There were {1} error(s), {2} info(s), and {3} warning(s). - -PublishWizardPublishErrorMsg = Error Publishing -PublishWizardPublishTitle = Publish -PublishWizardUnpublishErrorMsg = Error Unpublishing -PublishWizardUnpublishTitle = Unpublish - -RefreshActionToolTip = Refresh - -ServerManagerGetRepositoriesExceptionMsg = There was a problem obtaining repositories for the server "{0}." -ServerManagerGetWorkspacesExceptionMsg = There was a problem obtaining workspaces for repository "{0}." - -ServerPageAuthenticationGroupTitle = Authentication -ServerPageInvalidServerProperties = Cannot construct a server because all server properties are not valid -ServerPageOkStatusMsg = Define the server information where the DNA repositories are located. -ServerPagePasswordLabel = Password: -ServerPagePasswordToolTip = The password used to authenticate the user when connecting to the server -ServerPageSavePasswordButton = Save password -ServerPageSavePasswordLabel = Saved secret data is stored on your computer in a file that's difficult, but not impossible, for an intruder to read. -ServerPageSavePasswordToolTip = Indicates if the clear text password should be stored on the local file system -ServerPageTitle = Enter Server Information -ServerPageUrlLabel = URL: -ServerPageUrlToolTip = The URL used to connect to the server -ServerPageUserLabel = User: -ServerPageUserToolTip = The user login used when connecting to the server - -ServerViewToolTip = Manages the DNA server registry - -ServerWizardEditServerErrorMsg = There were errors editing a server. See log for more details. -ServerWizardEditServerTitle = Edit Server -ServerWizardNewServerErrorMsg = There were errors creating a new server. See log for more details. -ServerWizardNewServerTitle = New Server Added: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/log/EclipseLogger.java =================================================================== --- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/log/EclipseLogger.java (rev 0) +++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/log/EclipseLogger.java 2009-08-10 21:31:32 UTC (rev 1160) @@ -0,0 +1,822 @@ +/* + * JBoss DNA (http://www.jboss.org/dna) + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * See the AUTHORS.txt file in the distribution for a full listing of + * individual contributors. + * + * JBoss DNA is free software. Unless otherwise indicated, all code in JBoss DNA + * is licensed to you under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * JBoss DNA is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.dna.web.jcr.rest.client.swt.log; + +import java.text.MessageFormat; +import org.eclipse.core.runtime.ILog; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Platform; +import org.eclipse.core.runtime.Status; +import org.jboss.dna.web.jcr.rest.client.swt.IUiConstants; +import org.slf4j.Logger; +import org.slf4j.Marker; + +/** + * The <code>EclipseLogger</code> class provides an <code>org.slf4j.Logger</code> implementation that uses the Eclipse logger. + * + * @since 0.6 + */ +public final class EclipseLogger implements Logger { + + // =========================================================================================================================== + // Class Fields + // =========================================================================================================================== + + private static ILog LOGGER = Platform.getLog(Platform.getBundle(IUiConstants.PLUGIN_ID)); + + // =========================================================================================================================== + // Fields + // =========================================================================================================================== + + private String name; + + // =========================================================================================================================== + // Constructors + // =========================================================================================================================== + + EclipseLogger( String name ) { + this.name = name; + } + + // =========================================================================================================================== + // Methods + // =========================================================================================================================== + + /** + * {@inheritDoc} + * + * @see org.slf4j.Logger#debug(java.lang.String) + * @since 0.6 + */ + @Override + public void debug( String message ) { + if (isDebugEnabled()) info(message); + } + + /** + * {@inheritDoc} + * + * @see org.slf4j.Logger#debug(java.lang.String, java.lang.Object) + * @since 0.6 + */ + @Override + public void debug( String pattern, + Object arg ) { + if (isDebugEnabled()) info(pattern, arg); + } + + /** + * {@inheritDoc} + * + * @see org.slf4j.Logger#debug(java.lang.String, java.lang.Object[]) + * @since 0.6 + */ + @Override + public void debug( String pattern, + Object[] arguments ) { + if (isDebugEnabled()) info(pattern, arguments); + } + + /** + * {@inheritDoc} + * + * @see org.slf4j.Logger#debug(java.lang.String, java.lang.Throwable) + * @since 0.6 + */ + @Override + public void debug( String message, + Throwable e ) { + if (isDebugEnabled()) info(message, e); + } + + /** + * {@inheritDoc} + * + * @see org.slf4j.Logger#debug(org.slf4j.Marker, java.lang.String) + * @since 0.6 + */ + @Override + public void debug( Marker marker, + String message ) { + debug(message); + } + + /** + * {@inheritDoc} + * + * @see org.slf4j.Logger#debug(java.lang.String, java.lang.Object, java.lang.Object) + * @since 0.6 + */ + @Override + public void debug( String pattern, + Object arg1, + Object arg2 ) { + if (isDebugEnabled()) info(pattern, arg1, arg2); + } + + /** + * {@inheritDoc} + * + * @see org.slf4j.Logger#debug(org.slf4j.Marker, java.lang.String, java.lang.Object) + * @since 0.6 + */ + @Override + public void debug( Marker marker, + String pattern, + Object arg ) { + debug(pattern, arg); + } + + /** + * {@inheritDoc} + * + * @see org.slf4j.Logger#debug(org.slf4j.Marker, java.lang.String, java.lang.Object[]) + * @since 0.6 + */ + @Override + public void debug( Marker marker, + String pattern, + Object[] arguments ) { + debug(pattern, arguments); + } + + /** + * {@inheritDoc} + * + * @see org.slf4j.Logger#debug(org.slf4j.Marker, java.lang.String, java.lang.Throwable) + * @since 0.6 + */ + @Override + public void debug( Marker marker, + String message, + Throwable e ) { + debug(message, e); + } + + /** + * {@inheritDoc} + * + * @see org.slf4j.Logger#debug(org.slf4j.Marker, java.lang.String, java.lang.Object, java.lang.Object) + * @since 0.6 + */ + @Override + public void debug( Marker marker, + String pattern, + Object arg1, + Object arg2 ) { + debug(pattern, arg1, arg2); + } + + /** + * {@inheritDoc} + * + * @see org.slf4j.Logger#error(java.lang.String) + * @since 0.6 + */ + @Override + public void error( String message ) { + if (isErrorEnabled()) LOGGER.log(new Status(IStatus.ERROR, IUiConstants.PLUGIN_ID, message, null)); + } + + /** + * {@inheritDoc} + * + * @see org.slf4j.Logger#error(java.lang.String, java.lang.Object) + * @since 0.6 + */ + @Override + public void error( String pattern, + Object arg ) { + if (isErrorEnabled()) LOGGER.log(new Status(IStatus.ERROR, IUiConstants.PLUGIN_ID, MessageFormat.format(pattern, arg), + null)); + } + + /** + * {@inheritDoc} + * + * @see org.slf4j.Logger#error(java.lang.String, java.lang.Object[]) + * @since 0.6 + */ + @Override + public void error( String pattern, + Object[] arguments ) { + if (isErrorEnabled()) LOGGER.log(new Status(IStatus.ERROR, IUiConstants.PLUGIN_ID, MessageFormat.format(pattern, + arguments), null)); + } + + /** + * {@inheritDoc} + * + * @see org.slf4j.Logger#error(java.lang.String, java.lang.Throwable) + * @since 0.6 + */ + @Override + public void error( String message, + Throwable e ) { + if (isErrorEnabled()) LOGGER.log(new Status(IStatus.ERROR, IUiConstants.PLUGIN_ID, message, e)); + } + + /** + * {@inheritDoc} + * + * @see org.slf4j.Logger#error(org.slf4j.Marker, java.lang.String) + * @since 0.6 + */ + @Override + public void error( Marker marker, + String message ) { + error(message); + } + + /** + * {@inheritDoc} + * + * @see org.slf4j.Logger#error(java.lang.String, java.lang.Object, java.lang.Object) + * @since 0.6 + */ + @Override + public void error( String pattern, + Object arg1, + Object arg2 ) { + if (isErrorEnabled()) LOGGER.log(new Status(IStatus.ERROR, IUiConstants.PLUGIN_ID, MessageFormat.format(pattern, + arg1, + arg2), null)); + } + + /** + * {@inheritDoc} + * + * @see org.slf4j.Logger#error(org.slf4j.Marker, java.lang.String, java.lang.Object) + * @since 0.6 + */ + @Override + public void error( Marker marker, + String pattern, + Object arg ) { + error(pattern, arg); + } + + /** + * {@inheritDoc} + * + * @see org.slf4j.Logger#error(org.slf4j.Marker, java.lang.String, java.lang.Object[]) + * @since 0.6 + */ + @Override + public void error( Marker marker, + String pattern, + Object[] arguments ) { + error(pattern, arguments); + } + + /** + * {@inheritDoc} + * + * @see org.slf4j.Logger#error(org.slf4j.Marker, java.lang.String, java.lang.Throwable) + * @since 0.6 + */ + @Override + public void error( Marker marker, + String message, + Throwable e ) { + error(message, e); + } + + /** + * {@inheritDoc} + * + * @see org.slf4j.Logger#error(org.slf4j.Marker, java.lang.String, java.lang.Object, java.lang.Object) + * @since 0.6 + */ + @Override + public void error( Marker marker, + String pattern, + Object arg1, + Object arg2 ) { + error(pattern, arg1, arg2); + } + + /** + * {@inheritDoc} + * + * @see org.slf4j.Logger#getName() + * @since 0.6 + */ + @Override + public String getName() { + return this.name; + } + + /** + * {@inheritDoc} + * + * @see org.slf4j.Logger#info(java.lang.String) + * @since 0.6 + */ + @Override + public void info( String message ) { + if (isInfoEnabled()) LOGGER.log(new Status(IStatus.INFO, IUiConstants.PLUGIN_ID, message, null)); + } + + /** + * {@inheritDoc} + * + * @see org.slf4j.Logger#info(java.lang.String, java.lang.Object) + * @since 0.6 + */ + @Override + public void info( String pattern, + Object arg ) { + if (isInfoEnabled()) LOGGER.log(new Status(IStatus.INFO, IUiConstants.PLUGIN_ID, MessageFormat.format(pattern, arg), null)); + } + + /** + * {@inheritDoc} + * + * @see org.slf4j.Logger#info(java.lang.String, java.lang.Object[]) + * @since 0.6 + */ + @Override + public void info( String pattern, + Object[] arguments ) { + if (isInfoEnabled()) LOGGER.log(new Status(IStatus.INFO, IUiConstants.PLUGIN_ID, + MessageFormat.format(pattern, arguments), null)); + } + + /** + * {@inheritDoc} + * + * @see org.slf4j.Logger#info(java.lang.String, java.lang.Throwable) + * @since 0.6 + */ + @Override + public void info( String message, + Throwable e ) { + if (isInfoEnabled()) LOGGER.log(new Status(IStatus.INFO, IUiConstants.PLUGIN_ID, message, e)); + } + + /** + * {@inheritDoc} + * + * @see org.slf4j.Logger#info(org.slf4j.Marker, java.lang.String) + * @since 0.6 + */ + @Override + public void info( Marker marker, + String message ) { + info(message); + } + + /** + * {@inheritDoc} + * + * @see org.slf4j.Logger#info(java.lang.String, java.lang.Object, java.lang.Object) + * @since 0.6 + */ + @Override + public void info( String pattern, + Object arg1, + Object arg2 ) { + if (isInfoEnabled()) LOGGER.log(new Status(IStatus.INFO, IUiConstants.PLUGIN_ID, + MessageFormat.format(pattern, arg1, arg2), null)); + } + + /** + * {@inheritDoc} + * + * @see org.slf4j.Logger#info(org.slf4j.Marker, java.lang.String, java.lang.Object) + * @since 0.6 + */ + @Override + public void info( Marker marker, + String pattern, + Object arg ) { + info(pattern, arg); + } + + /** + * {@inheritDoc} + * + * @see org.slf4j.Logger#info(org.slf4j.Marker, java.lang.String, java.lang.Object[]) + * @since 0.6 + */ + @Override + public void info( Marker marker, + String pattern, + Object[] arguments ) { + info(pattern, arguments); + } + + /** + * {@inheritDoc} + * + * @see org.slf4j.Logger#info(org.slf4j.Marker, java.lang.String, java.lang.Throwable) + * @since 0.6 + */ + @Override + public void info( Marker marker, + String message, + Throwable e ) { + info(message, e); + } + + /** + * {@inheritDoc} + * + * @see org.slf4j.Logger#info(org.slf4j.Marker, java.lang.String, java.lang.Object, java.lang.Object) + * @since 0.6 + */ + @Override + public void info( Marker marker, + String pattern, + Object arg1, + Object arg2 ) { + info(pattern, arg1, arg2); + } + + /** + * {@inheritDoc} + * + * @see org.slf4j.Logger#isDebugEnabled() + * @since 0.6 + */ + @Override + public boolean isDebugEnabled() { + return false; + } + + /** + * {@inheritDoc} + * + * @see org.slf4j.Logger#isDebugEnabled(org.slf4j.Marker) + * @since 0.6 + */ + @Override + public boolean isDebugEnabled( Marker marker ) { + return isDebugEnabled(); + } + + /** + * {@inheritDoc} + * + * @see org.slf4j.Logger#isErrorEnabled() + * @since 0.6 + */ + @Override + public boolean isErrorEnabled() { + return false; + } + + /** + * {@inheritDoc} + * + * @see org.slf4j.Logger#isErrorEnabled(org.slf4j.Marker) + * @since 0.6 + */ + @Override + public boolean isErrorEnabled( Marker marker ) { + return isErrorEnabled(); + } + + /** + * {@inheritDoc} + * + * @see org.slf4j.Logger#isInfoEnabled() + * @since 0.6 + */ + @Override + public boolean isInfoEnabled() { + return false; + } + + /** + * {@inheritDoc} + * + * @see org.slf4j.Logger#isInfoEnabled(org.slf4j.Marker) + * @since 0.6 + */ + @Override + public boolean isInfoEnabled( Marker marker ) { + return isInfoEnabled(); + } + + /** + * {@inheritDoc} + * + * @see org.slf4j.Logger#isTraceEnabled() + * @since 0.6 + */ + @Override + public boolean isTraceEnabled() { + return false; + } + + /** + * {@inheritDoc} + * + * @see org.slf4j.Logger#isTraceEnabled(org.slf4j.Marker) + * @since 0.6 + */ + @Override + public boolean isTraceEnabled( Marker marker ) { + return isTraceEnabled(); + } + + /** + * {@inheritDoc} + * + * @see org.slf4j.Logger#isWarnEnabled() + * @since 0.6 + */ + @Override + public boolean isWarnEnabled() { + return false; + } + + /** + * {@inheritDoc} + * + * @see org.slf4j.Logger#isWarnEnabled(org.slf4j.Marker) + * @since 0.6 + */ + @Override + public boolean isWarnEnabled( Marker marker ) { + return isWarnEnabled(); + } + + /** + * {@inheritDoc} + * + * @see org.slf4j.Logger#trace(java.lang.String) + * @since 0.6 + */ + @Override + public void trace( String message ) { + if (isTraceEnabled()) info(message); + } + + /** + * {@inheritDoc} + * + * @see org.slf4j.Logger#trace(java.lang.String, java.lang.Object) + * @since 0.6 + */ + @Override + public void trace( String pattern, + Object arg ) { + if (isTraceEnabled()) info(pattern, arg); + } + + /** + * {@inheritDoc} + * + * @see org.slf4j.Logger#trace(java.lang.String, java.lang.Object[]) + * @since 0.6 + */ + @Override + public void trace( String pattern, + Object[] arguments ) { + if (isTraceEnabled()) info(pattern, arguments); + } + + /** + * {@inheritDoc} + * + * @see org.slf4j.Logger#trace(java.lang.String, java.lang.Throwable) + * @since 0.6 + */ + @Override + public void trace( String message, + Throwable e ) { + if (isTraceEnabled()) info(message, e); + } + + /** + * {@inheritDoc} + * + * @see org.slf4j.Logger#trace(org.slf4j.Marker, java.lang.String) + * @since 0.6 + */ + @Override + public void trace( Marker marker, + String message ) { + trace(message); + } + + /** + * {@inheritDoc} + * + * @see org.slf4j.Logger#trace(java.lang.String, java.lang.Object, java.lang.Object) + * @since 0.6 + */ + @Override + public void trace( String pattern, + Object arg1, + Object arg2 ) { + if (isTraceEnabled()) info(pattern, arg1, arg2); + } + + /** + * {@inheritDoc} + * + * @see org.slf4j.Logger#trace(org.slf4j.Marker, java.lang.String, java.lang.Object) + * @since 0.6 + */ + @Override + public void trace( Marker marker, + String pattern, + Object arg ) { + trace(pattern, arg); + } + + /** + * {@inheritDoc} + * + * @see org.slf4j.Logger#trace(org.slf4j.Marker, java.lang.String, java.lang.Object[]) + * @since 0.6 + */ + @Override + public void trace( Marker marker, + String pattern, + Object[] arguments ) { + trace(pattern, arguments); + } + + /** + * {@inheritDoc} + * + * @see org.slf4j.Logger#trace(org.slf4j.Marker, java.lang.String, java.lang.Throwable) + * @since 0.6 + */ + @Override + public void trace( Marker marker, + String message, + Throwable e ) { + trace(message, e); + } + + /** + * {@inheritDoc} + * + * @see org.slf4j.Logger#trace(org.slf4j.Marker, java.lang.String, java.lang.Object, java.lang.Object) + * @since 0.6 + */ + @Override + public void trace( Marker marker, + String pattern, + Object arg1, + Object arg2 ) { + trace(pattern, arg1, arg2); + } + + /** + * {@inheritDoc} + * + * @see org.slf4j.Logger#warn(java.lang.String) + * @since 0.6 + */ + @Override + public void warn( String message ) { + if (isWarnEnabled()) LOGGER.log(new Status(IStatus.WARNING, IUiConstants.PLUGIN_ID, message, null)); + } + + /** + * {@inheritDoc} + * + * @see org.slf4j.Logger#warn(java.lang.String, java.lang.Object) + * @since 0.6 + */ + @Override + public void warn( String pattern, + Object arg ) { + if (isWarnEnabled()) LOGGER.log(new Status(IStatus.WARNING, IUiConstants.PLUGIN_ID, MessageFormat.format(pattern, arg), + null)); + } + + /** + * {@inheritDoc} + * + * @see org.slf4j.Logger#warn(java.lang.String, java.lang.Object[]) + * @since 0.6 + */ + @Override + public void warn( String pattern, + Object[] arguments ) { + if (isWarnEnabled()) LOGGER.log(new Status(IStatus.WARNING, IUiConstants.PLUGIN_ID, MessageFormat.format(pattern, + arguments), null)); + } + + /** + * {@inheritDoc} + * + * @see org.slf4j.Logger#warn(java.lang.String, java.lang.Throwable) + * @since 0.6 + */ + @Override + public void warn( String message, + Throwable e ) { + if (isWarnEnabled()) LOGGER.log(new Status(IStatus.WARNING, IUiConstants.PLUGIN_ID, message, e)); + } + + /** + * {@inheritDoc} + * + * @see org.slf4j.Logger#warn(org.slf4j.Marker, java.lang.String) + * @since 0.6 + */ + @Override + public void warn( Marker marker, + String message ) { + warn(message); + } + + /** + * {@inheritDoc} + * + * @see org.slf4j.Logger#warn(java.lang.String, java.lang.Object, java.lang.Object) + * @since 0.6 + */ + @Override + public void warn( String pattern, + Object arg1, + Object arg2 ) { + if (isWarnEnabled()) LOGGER.log(new Status(IStatus.WARNING, IUiConstants.PLUGIN_ID, MessageFormat.format(pattern, + arg1, + arg2), null)); + } + + /** + * {@inheritDoc} + * + * @see org.slf4j.Logger#warn(org.slf4j.Marker, java.lang.String, java.lang.Object) + * @since 0.6 + */ + @Override + public void warn( Marker marker, + String pattern, + Object arg ) { + warn(pattern, arg); + } + + /** + * {@inheritDoc} + * + * @see org.slf4j.Logger#warn(org.slf4j.Marker, java.lang.String, java.lang.Object[]) + * @since 0.6 + */ + @Override + public void warn( Marker marker, + String pattern, + Object[] arguments ) { + warn(pattern, arguments); + } + + /** + * {@inheritDoc} + * + * @see org.slf4j.Logger#warn(org.slf4j.Marker, java.lang.String, java.lang.Throwable) + * @since 0.6 + */ + @Override + public void warn( Marker marker, + String message, + Throwable e ) { + warn(message, e); + } + + /** + * {@inheritDoc} + * + * @see org.slf4j.Logger#warn(org.slf4j.Marker, java.lang.String, java.lang.Object, java.lang.Object) + * @since 0.6 + */ + @Override + public void warn( Marker marker, + String pattern, + Object arg1, + Object arg2 ) { + warn(pattern, arg1, arg2); + } + +} Property changes on: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/log/EclipseLogger.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/log/EclipseLoggerFactory.java =================================================================== --- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/log/EclipseLoggerFactory.java (rev 0) +++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/log/EclipseLoggerFactory.java 2009-08-10 21:31:32 UTC (rev 1160) @@ -0,0 +1,98 @@ +/* + * JBoss DNA (http://www.jboss.org/dna) + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * See the AUTHORS.txt file in the distribution for a full listing of + * individual contributors. + * + * JBoss DNA is free software. Unless otherwise indicated, all code in JBoss DNA + * is licensed to you under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * JBoss DNA is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.dna.web.jcr.rest.client.swt.log; + +import java.util.HashMap; +import java.util.Map; +import org.slf4j.ILoggerFactory; +import org.slf4j.Logger; + +/** + * @since 0.6 + */ +public final class EclipseLoggerFactory implements ILoggerFactory { + + // =========================================================================================================================== + // Class Fields + // =========================================================================================================================== + + /** + * The shared instance of the factory. + * + * @since 0.6 + */ + static final EclipseLoggerFactory INSTANCE = new EclipseLoggerFactory(); + + // =========================================================================================================================== + // Methods + // =========================================================================================================================== + + /** + * Map of loggers keyed by logger name. + * + * @since 0.6 + */ + private Map<String, Logger> loggerMap; + + // =========================================================================================================================== + // Constructors + // =========================================================================================================================== + + /** + * Constructs the factory. + * + * @since 0.6 + */ + public EclipseLoggerFactory() { + this.loggerMap = new HashMap<String, Logger>(); + } + + // =========================================================================================================================== + // Methods + // =========================================================================================================================== + + /** + * {@inheritDoc} + * + * @see org.slf4j.ILoggerFactory#getLogger(java.lang.String) + * @since 0.6 + */ + @Override + public Logger getLogger( String name ) { + Logger logger = null; + + // protect against concurrent access of the loggerMap + synchronized (this) { + logger = this.loggerMap.get(name); + + if (logger == null) { + logger = new EclipseLogger(name); + this.loggerMap.put(name, logger); + } + } + + return logger; + } + +} Property changes on: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/log/EclipseLoggerFactory.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/log/StaticLoggerBinder.java =================================================================== --- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/log/StaticLoggerBinder.java (rev 0) +++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/log/StaticLoggerBinder.java 2009-08-10 21:31:32 UTC (rev 1160) @@ -0,0 +1,101 @@ +/* + * JBoss DNA (http://www.jboss.org/dna) + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * See the AUTHORS.txt file in the distribution for a full listing of + * individual contributors. + * + * JBoss DNA is free software. Unless otherwise indicated, all code in JBoss DNA + * is licensed to you under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * JBoss DNA is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.dna.web.jcr.rest.client.swt.log; + +import org.slf4j.ILoggerFactory; +import org.slf4j.spi.LoggerFactoryBinder; + +/** + * @since 0.6 + */ +public final class StaticLoggerBinder implements LoggerFactoryBinder { + + // =========================================================================================================================== + // Class Fields + // =========================================================================================================================== + + /** + * The class name of the logger factory. + * + * @since 0.6 + */ + private static final String LOGGER_FACTORY_CLASS_NAME = EclipseLoggerFactory.class.getName(); + + /** + * The unique instance of this class. + * + * @since 0.6 + */ + private static final StaticLoggerBinder SINGLETON = new StaticLoggerBinder(); + + // =========================================================================================================================== + // Class Methods + // =========================================================================================================================== + + /** + * @return the static instance of the logger + * @since 0.6 + */ + public static final StaticLoggerBinder getSingleton() { + return SINGLETON; + } + + // =========================================================================================================================== + // Fields + // =========================================================================================================================== + + /** + * The logger factory used. + * + * @since 0.6 + */ + private final ILoggerFactory loggerFactory = new EclipseLoggerFactory(); + + // =========================================================================================================================== + // Methods + // =========================================================================================================================== + + /** + * {@inheritDoc} + * + * @see org.slf4j.spi.LoggerFactoryBinder#getLoggerFactory() + * @since 0.6 + */ + @Override + public ILoggerFactory getLoggerFactory() { + return this.loggerFactory; + } + + /** + * {@inheritDoc} + * + * @see org.slf4j.spi.LoggerFactoryBinder#getLoggerFactoryClassStr() + * @since 0.6 + */ + @Override + public String getLoggerFactoryClassStr() { + return LOGGER_FACTORY_CLASS_NAME; + } + +} Property changes on: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/log/StaticLoggerBinder.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/package-info.java =================================================================== --- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/package-info.java (rev 0) +++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/package-info.java 2009-08-10 21:31:32 UTC (rev 1160) @@ -0,0 +1,27 @@ +/* + * JBoss DNA (http://www.jboss.org/dna) + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * See the AUTHORS.txt file in the distribution for a full listing of + * individual contributors. + * + * JBoss DNA is free software. Unless otherwise indicated, all code in JBoss DNA + * is licensed to you under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * JBoss DNA is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +/** + * The JBoss DNA REST Client Eclipse plugin is a UI that interfaces with the non-UI DNA REST client Maven project. + */ +package org.jboss.dna.web.jcr.rest.client.swt; \ No newline at end of file Property changes on: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/package-info.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/views/ServerContentProvider.java =================================================================== --- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/views/ServerContentProvider.java 2009-08-10 18:34:03 UTC (rev 1159) +++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/views/ServerContentProvider.java 2009-08-10 21:31:32 UTC (rev 1160) @@ -37,12 +37,11 @@ import org.jboss.dna.web.jcr.rest.client.domain.Server; import org.jboss.dna.web.jcr.rest.client.domain.Workspace; import org.jboss.dna.web.jcr.rest.client.swt.Activator; -import org.jboss.dna.web.jcr.rest.client.swt.I18n; +import org.jboss.dna.web.jcr.rest.client.swt.RestClientI18n; /** - * The ServerContentProvider is a content and label provider for DNA repositories. + * The <code>ServerContentProvider</code> is a content and label provider for DNA repositories. * - * @author Dan Florian * @since 0.6 */ public final class ServerContentProvider extends ColumnLabelProvider implements ITreeContentProvider { @@ -118,11 +117,11 @@ return this.serverManager.getRepositories((Server)parentElement).toArray(); } } catch (Exception e) { - String msg = I18n.bind(I18n.ServerManagerGetRepositoriesExceptionMsg, ((Server)parentElement).getShortDescription()); + String msg = RestClientI18n.serverManagerGetRepositoriesExceptionMsg.text(((Server)parentElement).getShortDescription()); Activator.getDefault().log(new Status(Severity.ERROR, msg, e)); if (this.viewer.getControl().isVisible()) { - MessageDialog.openError(this.viewer.getControl().getShell(), I18n.ErrorDialogTitle, msg); + MessageDialog.openError(this.viewer.getControl().getShell(), RestClientI18n.errorDialogTitle.text(), msg); } } @@ -131,11 +130,11 @@ return this.serverManager.getWorkspaces((Repository)parentElement).toArray(); } } catch (Exception e) { - String msg = I18n.ServerManagerGetWorkspacesExceptionMsg; + String msg = RestClientI18n.serverManagerGetWorkspacesExceptionMsg.text(); Activator.getDefault().log(new Status(Severity.ERROR, msg, e)); if (this.viewer.getControl().isVisible()) { - MessageDialog.openError(this.viewer.getControl().getShell(), I18n.ErrorDialogTitle, msg); + MessageDialog.openError(this.viewer.getControl().getShell(), RestClientI18n.errorDialogTitle.text(), msg); } } Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/views/ServerView.java =================================================================== --- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/views/ServerView.java 2009-08-10 18:34:03 UTC (rev 1159) +++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/views/ServerView.java 2009-08-10 21:31:32 UTC (rev 1160) @@ -47,15 +47,14 @@ import org.jboss.dna.web.jcr.rest.client.ServerRegistryEvent; import org.jboss.dna.web.jcr.rest.client.domain.IDnaObject; import org.jboss.dna.web.jcr.rest.client.swt.Activator; -import org.jboss.dna.web.jcr.rest.client.swt.I18n; +import org.jboss.dna.web.jcr.rest.client.swt.RestClientI18n; import org.jboss.dna.web.jcr.rest.client.swt.actions.DeleteServerAction; import org.jboss.dna.web.jcr.rest.client.swt.actions.EditServerAction; import org.jboss.dna.web.jcr.rest.client.swt.actions.NewServerAction; /** - * The ServerView shows all defined servers and their DNA repositories. + * The <code>ServerView</code> shows all defined servers and their DNA repositories. * - * @author Dan Florian * @since 0.6 */ public final class ServerView extends ViewPart implements IServerRegistryListener { @@ -127,7 +126,7 @@ } }; - this.collapseAllAction.setToolTipText(I18n.CollapseActionToolTip); + this.collapseAllAction.setToolTipText(RestClientI18n.collapseActionToolTip.text()); this.collapseAllAction.setImageDescriptor(Activator.getDefault().getImageDescriptor(COLLAPSE_ALL_IMAGE_PATH)); // the refresh action is always enabled @@ -138,7 +137,7 @@ } }; - this.refreshAction.setToolTipText(I18n.RefreshActionToolTip); + this.refreshAction.setToolTipText(RestClientI18n.refreshActionToolTip.text()); this.refreshAction.setImageDescriptor(Activator.getDefault().getImageDescriptor(REFRESH_IMAGE_PATH)); // the shell used for dialogs that the actions display @@ -226,7 +225,7 @@ constructToolBar(); constructContextMenu(); - setTitleToolTip(I18n.ServerViewToolTip); + setTitleToolTip(RestClientI18n.serverViewToolTip.text()); // register to receive changes to the server registry getServerManager().addRegistryListener(this); Added: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/views/package-info.java =================================================================== --- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/views/package-info.java (rev 0) +++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/views/package-info.java 2009-08-10 21:31:32 UTC (rev 1160) @@ -0,0 +1,28 @@ +/* + * JBoss DNA (http://www.jboss.org/dna) + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * See the AUTHORS.txt file in the distribution for a full listing of + * individual contributors. + * + * JBoss DNA is free software. Unless otherwise indicated, all code in JBoss DNA + * is licensed to you under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * JBoss DNA is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +/** + * The JBoss DNA REST Client Eclipse views package defines the Eclipse views that are needed to publish, unpublish, and manage + * the server registry. + */ +package org.jboss.dna.web.jcr.rest.client.swt.views; \ No newline at end of file Property changes on: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/views/package-info.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/wizards/PublishOperation.java =================================================================== --- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/wizards/PublishOperation.java 2009-08-10 18:34:03 UTC (rev 1159) +++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/wizards/PublishOperation.java 2009-08-10 21:31:32 UTC (rev 1160) @@ -28,17 +28,24 @@ import java.util.List; import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.ui.console.ConsolePlugin; +import org.eclipse.ui.console.IConsole; +import org.eclipse.ui.console.IConsoleManager; +import org.eclipse.ui.console.MessageConsole; +import org.eclipse.ui.console.MessageConsoleStream; +import org.jboss.dna.common.util.CheckArg; +import org.jboss.dna.web.jcr.rest.client.ServerManager; import org.jboss.dna.web.jcr.rest.client.Status; -import org.jboss.dna.web.jcr.rest.client.Utils; import org.jboss.dna.web.jcr.rest.client.domain.Workspace; import org.jboss.dna.web.jcr.rest.client.swt.Activator; -import org.jboss.dna.web.jcr.rest.client.swt.I18n; +import org.jboss.dna.web.jcr.rest.client.swt.RestClientI18n; /** - * @author Dan Florian + * The <code>PublishOperation</code> publishes or unpublishes one or more files using the {@link ServerManager}. + * * @since 0.6 */ -public class PublishOperation { +public final class PublishOperation { // =========================================================================================================================== // Constants @@ -65,6 +72,13 @@ UNPUBLISH } + /** + * The name of the message console that is written to. + * + * @since 0.6 + */ + private static final String CONSOLE_NAME = RestClientI18n.publishOperationConsoleName.text(); + // =========================================================================================================================== // Fields // =========================================================================================================================== @@ -110,9 +124,9 @@ public PublishOperation( Type type, List<IFile> files, Workspace workspace ) { - Utils.nullArgumentCheck("type", type); //$NON-NLS-1$ - Utils.nullArgumentCheck("files", files); //$NON-NLS-1$ - Utils.nullArgumentCheck("workspace", workspace); //$NON-NLS-1$ + CheckArg.isNotNull(type, "type"); //$NON-NLS-1$ + CheckArg.isNotNull(files, "files"); //$NON-NLS-1$ + CheckArg.isNotNull(workspace, "workspace"); //$NON-NLS-1$ this.type = type; this.files = files; @@ -159,12 +173,22 @@ this.results = new PublishingResults(this.type, this.files); try { - String name = (isPublishing() ? I18n.PublishOperationPublishTaskName : I18n.PublishOperationUnpublishTaskName); + String name = (isPublishing() ? RestClientI18n.publishOperationPublishTaskName.text() : RestClientI18n.publishOperationUnpublishTaskName.text()); monitor.beginTask(name, this.files.size()); monitor.setTaskName(name); + // write initial message to console + if (isPublishing()) { + writeToConsole(RestClientI18n.publishOperationPublish.text(this.workspace.getServer().getUrl(), + this.workspace.getRepository().getName(), + this.workspace.getName())); + } else { + writeToConsole(RestClientI18n.publishOperationUnpublish.text(this.workspace.getServer().getUrl(), + this.workspace.getRepository().getName(), + this.workspace.getName())); + } + for (IFile eclipseFile : this.files) { - if (monitor.isCanceled()) { throw new InterruptedException(); } @@ -172,7 +196,6 @@ File file = eclipseFile.getLocation().toFile(); Status status = null; - // TODO call publisher here (timeout?) if (isPublishing()) { status = Activator.getDefault().getServerManager().publish(this.workspace, eclipseFile.getFullPath().toString(), @@ -183,9 +206,15 @@ file); } - results.addStatus(status); monitor.worked(1); + this.results.addStatus(status); + + // write to console + writeToConsole(file, eclipseFile.getParent().getFullPath().toString(), status); } + + // add a gap before next console message + writeToConsole("\n"); //$NON-NLS-1$ } catch (InterruptedException e) { throw e; } catch (Exception e) { @@ -196,4 +225,58 @@ } } + /** + * @param file the file involved in the publishing operation + * @param workspacePath the path in the workspace where the file is located + * @param status the status of the publishing operation + * @since 0.6 + */ + private void writeToConsole( File file, + String workspacePath, + Status status ) { + String msg = null; + + if (status.isError()) { + msg = (isPublishing() ? RestClientI18n.publishOperationPublishFileFailed.text(file.getAbsolutePath(), workspacePath) + : RestClientI18n.publishOperationUnpublishFileFailed.text(file.getAbsolutePath(), workspacePath)); + } else { + msg = (isPublishing() ? RestClientI18n.publishOperationPublishFile.text(file.getAbsolutePath(), workspacePath) + : RestClientI18n.publishOperationUnpublishFile.text(file.getAbsolutePath(), workspacePath)); + } + + // TODO create hyperlink in console for the file + writeToConsole(msg); + } + + /** + * @param message the message being written to the DNA console + * @since 0.6 + */ + private void writeToConsole( String message ) { + MessageConsole console = null; + IConsoleManager consoleMgr = ConsolePlugin.getDefault().getConsoleManager(); + IConsole[] consoles = consoleMgr.getConsoles(); + + // see if DNA console already exists + for (int i = 0; i < consoles.length; ++i) { + if (CONSOLE_NAME.equals(consoles[i].getName())) { + console = (MessageConsole)consoles[i]; + break; + } + } + + // create DNA console if necessary + if (console == null) { + console = new MessageConsole(CONSOLE_NAME, null); + consoleMgr.addConsoles(new IConsole[] {console}); + } + + // show and focus console view + console.activate(); + + // write message + MessageConsoleStream out = console.newMessageStream(); + out.println(message); + } + } Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/wizards/PublishPage.java =================================================================== --- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/wizards/PublishPage.java 2009-08-10 18:34:03 UTC (rev 1159) +++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/wizards/PublishPage.java 2009-08-10 21:31:32 UTC (rev 1160) @@ -61,12 +61,13 @@ import org.jboss.dna.web.jcr.rest.client.domain.Server; import org.jboss.dna.web.jcr.rest.client.domain.Workspace; import org.jboss.dna.web.jcr.rest.client.swt.Activator; -import org.jboss.dna.web.jcr.rest.client.swt.I18n; +import org.jboss.dna.web.jcr.rest.client.swt.RestClientI18n; import org.jboss.dna.web.jcr.rest.client.swt.actions.NewServerAction; import org.jboss.dna.web.jcr.rest.client.swt.wizards.PublishOperation.Type; /** - * @author Dan Florian + * The <code>PublishPage</code> is a UI for publishing or unpublishing one or more files to a DNA repository. + * * @since 0.6 */ public final class PublishPage extends WizardPage implements IServerRegistryListener, ModifyListener { @@ -375,7 +376,8 @@ public PublishPage( Type type, List<IResource> resources ) throws CoreException { super(PublishPage.class.getSimpleName()); - setTitle((type == Type.PUBLISH) ? I18n.PublishPagePublishTitle : I18n.PublishPageUnpublishTitle); + setTitle((type == Type.PUBLISH) ? RestClientI18n.publishPagePublishTitle.text() + : RestClientI18n.publishPageUnpublishTitle.text()); setPageComplete(false); this.type = type; @@ -388,7 +390,7 @@ private void constructLocationPanel( Composite parent ) { Group pnl = new Group(parent, SWT.NONE); - pnl.setText(I18n.PublishPageLocationGroupTitle); + pnl.setText(RestClientI18n.publishPageLocationGroupTitle.text()); pnl.setLayout(new GridLayout(2, false)); pnl.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false)); @@ -408,16 +410,16 @@ Label lblServer = new Label(pnlServer, SWT.LEFT); lblServer.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false)); - lblServer.setText(I18n.PublishPageServerLabel); + lblServer.setText(RestClientI18n.publishPageServerLabel.text()); this.cbxServer = new Combo(pnlServer, SWT.DROP_DOWN | SWT.READ_ONLY); this.cbxServer.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false)); - this.cbxServer.setToolTipText(I18n.PublishPageServerToolTip); + this.cbxServer.setToolTipText(RestClientI18n.publishPageServerToolTip.text()); final IAction action = new NewServerAction(this.getShell(), getServerManager()); final Button btnNewServer = new Button(pnlServer, SWT.PUSH); btnNewServer.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false)); - btnNewServer.setText(I18n.PublishPageNewServerButton); + btnNewServer.setText(RestClientI18n.publishPageNewServerButton.text()); btnNewServer.setToolTipText(action.getToolTipText()); btnNewServer.addSelectionListener(new SelectionAdapter() { @Override @@ -442,25 +444,25 @@ { // row 2: repository row Label lblRepository = new Label(pnl, SWT.LEFT); lblRepository.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false)); - lblRepository.setText(I18n.PublishPageRepositoryLabel); + lblRepository.setText(RestClientI18n.publishPageRepositoryLabel.text()); this.cbxRepository = new Combo(pnl, SWT.DROP_DOWN | SWT.READ_ONLY); this.cbxRepository.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false)); - this.cbxRepository.setToolTipText(I18n.PublishPageRepositoryToolTip); + this.cbxRepository.setToolTipText(RestClientI18n.publishPageRepositoryToolTip.text()); } { // row 3: workspace row Label lblWorkspace = new Label(pnl, SWT.LEFT); lblWorkspace.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false)); - lblWorkspace.setText(I18n.PublishPageWorkspaceLabel); + lblWorkspace.setText(RestClientI18n.publishPageWorkspaceLabel.text()); this.cbxWorkspace = new Combo(pnl, SWT.DROP_DOWN | SWT.READ_ONLY); this.cbxWorkspace.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false)); if (type == Type.PUBLISH) { - this.cbxWorkspace.setToolTipText(I18n.PublishPageWorkspacePublishToolTip); + this.cbxWorkspace.setToolTipText(RestClientI18n.publishPageWorkspacePublishToolTip.text()); } else { - this.cbxWorkspace.setToolTipText(I18n.PublishPageWorkspaceUnpublishToolTip); + this.cbxWorkspace.setToolTipText(RestClientI18n.publishPageWorkspaceUnpublishToolTip.text()); } } } @@ -480,9 +482,9 @@ lbl.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false)); if (type == Type.PUBLISH) { - lbl.setText(I18n.PublishPagePublishResourcesLabel); + lbl.setText(RestClientI18n.publishPagePublishResourcesLabel.text()); } else { - lbl.setText(I18n.PublishPageUnpublishResourcesLabel); + lbl.setText(RestClientI18n.publishPageUnpublishResourcesLabel.text()); } } @@ -510,8 +512,8 @@ { // row 3 final Button chkRecurse = new Button(pnl, SWT.CHECK); chkRecurse.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false)); - chkRecurse.setText(I18n.PublishPageRecurseCheckBox); - chkRecurse.setToolTipText(I18n.PublishPageRecurseCheckBoxToolTip); + chkRecurse.setText(RestClientI18n.publishPageRecurseCheckBox.text()); + chkRecurse.setToolTipText(RestClientI18n.publishPageRecurseCheckBoxToolTip.text()); chkRecurse.setSelection(this.recurse); chkRecurse.addSelectionListener(new SelectionAdapter() { @Override @@ -575,7 +577,8 @@ * @since 0.6 */ void updateInitialMessage() { - String msg = ((this.type == Type.PUBLISH) ? I18n.PublishPagePublishOkStatusMsg : I18n.PublishPageUnpublishOkStatusMsg); + String msg = ((this.type == Type.PUBLISH) ? RestClientI18n.publishPagePublishOkStatusMsg.text() + : RestClientI18n.publishPageUnpublishOkStatusMsg.text()); if (msg.equals(getMessage())) { updateState(); @@ -613,10 +616,12 @@ this.files = processResources(this.resources, isRecursing()); loadFiles(); } catch (CoreException e) { - Activator.getDefault().log(new Status(Severity.ERROR, I18n.PublishPageRecurseProcessingErrorMsg, e)); + Activator.getDefault().log(new Status(Severity.ERROR, RestClientI18n.publishPageRecurseProcessingErrorMsg.text(), e)); if (getControl().isVisible()) { - MessageDialog.openError(getShell(), I18n.ErrorDialogTitle, I18n.PublishPageRecurseProcessingErrorMsg); + MessageDialog.openError(getShell(), + RestClientI18n.errorDialogTitle.text(), + RestClientI18n.publishPageRecurseProcessingErrorMsg.text()); } } } @@ -745,11 +750,11 @@ this.repositories = new ArrayList<Repository>(getServerManager().getRepositories(this.server)); } catch (Exception e) { this.repositories = Collections.emptyList(); - String msg = I18n.bind(I18n.ServerManagerGetRepositoriesExceptionMsg, this.server.getShortDescription()); + String msg = RestClientI18n.serverManagerGetRepositoriesExceptionMsg.text(this.server.getShortDescription()); Activator.getDefault().log(new Status(Severity.ERROR, msg, e)); if (getControl().isVisible()) { - MessageDialog.openError(getShell(), I18n.ErrorDialogTitle, msg); + MessageDialog.openError(getShell(), RestClientI18n.errorDialogTitle.text(), msg); } } } @@ -857,11 +862,11 @@ this.workspaces = new ArrayList<Workspace>(getServerManager().getWorkspaces(this.repository)); } catch (Exception e) { this.workspaces = Collections.emptyList(); - String msg = I18n.ServerManagerGetWorkspacesExceptionMsg; + String msg = RestClientI18n.serverManagerGetWorkspacesExceptionMsg.text(); Activator.getDefault().log(new Status(Severity.ERROR, msg, e)); if (getControl().isVisible()) { - MessageDialog.openError(getShell(), I18n.ErrorDialogTitle, msg); + MessageDialog.openError(getShell(), RestClientI18n.errorDialogTitle.text(), msg); } } } @@ -922,9 +927,8 @@ public Exception[] serverRegistryChanged( ServerRegistryEvent event ) { // should only be a new server event if (event.isNew()) { - Server newServer = event.getServer(); - this.servers.add(newServer); - this.cbxServer.add(newServer.getName()); + refreshServers(); + updateState(); } return null; @@ -949,7 +953,8 @@ // set initial message if (this.status.isOk()) { - String msg = ((this.type == Type.PUBLISH) ? I18n.PublishPagePublishOkStatusMsg : I18n.PublishPageUnpublishOkStatusMsg); + String msg = ((this.type == Type.PUBLISH) ? RestClientI18n.publishPagePublishOkStatusMsg.text() + : RestClientI18n.publishPageUnpublishOkStatusMsg.text()); setMessage(msg); } else { setErrorMessage(this.status.getMessage()); @@ -973,7 +978,7 @@ try { this.files = processResources(this.resources, this.recurse); } catch (CoreException e) { - Activator.getDefault().log(new Status(Severity.ERROR, I18n.PublishPageRecurseProcessingErrorMsg, e)); + Activator.getDefault().log(new Status(Severity.ERROR, RestClientI18n.publishPageRecurseProcessingErrorMsg.text(), e)); } } @@ -1007,7 +1012,7 @@ // update page message if (this.status.isError()) { - setMessage(this.status.getMessage(), IMessageProvider.ERROR); + setErrorMessage(this.status.getMessage()); } else { if (this.status.isWarning()) { setMessage(this.status.getMessage(), IMessageProvider.WARNING); @@ -1029,19 +1034,24 @@ Severity severity = Severity.ERROR; if ((this.resources == null) || this.resources.isEmpty() || this.files.isEmpty()) { - msg = ((type == Type.PUBLISH) ? I18n.PublishPageNoResourcesToPublishStatusMsg : I18n.PublishPageNoResourcesToUnpublishStatusMsg); + msg = ((type == Type.PUBLISH) ? RestClientI18n.publishPageNoResourcesToPublishStatusMsg.text() + : RestClientI18n.publishPageNoResourcesToUnpublishStatusMsg.text()); } else if (this.server == null) { int count = this.cbxServer.getItemCount(); - msg = ((count == 0) ? I18n.PublishPageNoAvailableServersStatusMsg : I18n.PublishPageMissingServerStatusMsg); + msg = ((count == 0) ? RestClientI18n.publishPageNoAvailableServersStatusMsg.text() + : RestClientI18n.publishPageMissingServerStatusMsg.text()); } else if (this.repository == null) { int count = this.cbxRepository.getItemCount(); - msg = ((count == 0) ? I18n.PublishPageNoAvailableRepositoriesStatusMsg : I18n.PublishPageMissingRepositoryStatusMsg); + msg = ((count == 0) ? RestClientI18n.publishPageNoAvailableRepositoriesStatusMsg.text() + : RestClientI18n.publishPageMissingRepositoryStatusMsg.text()); } else if (this.workspace == null) { int count = this.cbxWorkspace.getItemCount(); - msg = ((count == 0) ? I18n.PublishPageNoAvailableWorkspacesStatusMsg : I18n.PublishPageMissingWorkspaceStatusMsg); + msg = ((count == 0) ? RestClientI18n.publishPageNoAvailableWorkspacesStatusMsg.text() + : RestClientI18n.publishPageMissingWorkspaceStatusMsg.text()); } else { severity = Severity.OK; - msg = ((type == Type.PUBLISH) ? I18n.PublishPagePublishOkStatusMsg : I18n.PublishPageUnpublishOkStatusMsg); + msg = ((type == Type.PUBLISH) ? RestClientI18n.publishPagePublishOkStatusMsg.text() + : RestClientI18n.publishPageUnpublishOkStatusMsg.text()); } this.status = new Status(severity, msg, null); Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/wizards/PublishWizard.java =================================================================== --- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/wizards/PublishWizard.java 2009-08-10 18:34:03 UTC (rev 1159) +++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/wizards/PublishWizard.java 2009-08-10 21:31:32 UTC (rev 1160) @@ -34,18 +34,17 @@ import org.eclipse.jface.dialogs.ProgressMonitorDialog; import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.jface.wizard.Wizard; +import org.jboss.dna.common.util.CheckArg; import org.jboss.dna.web.jcr.rest.client.ServerManager; import org.jboss.dna.web.jcr.rest.client.Status; -import org.jboss.dna.web.jcr.rest.client.Utils; import org.jboss.dna.web.jcr.rest.client.Status.Severity; import org.jboss.dna.web.jcr.rest.client.domain.Workspace; import org.jboss.dna.web.jcr.rest.client.swt.Activator; -import org.jboss.dna.web.jcr.rest.client.swt.I18n; +import org.jboss.dna.web.jcr.rest.client.swt.RestClientI18n; import org.jboss.dna.web.jcr.rest.client.swt.dialogs.PublishingResultsDialog; import org.jboss.dna.web.jcr.rest.client.swt.wizards.PublishOperation.Type; /** - * @author Dan Florian * @since 0.6 */ public final class PublishWizard extends Wizard { @@ -89,15 +88,16 @@ public PublishWizard( Type type, List<IResource> resources, ServerManager serverManager ) throws CoreException { - Utils.nullArgumentCheck("type", type); //$NON-NLS-1$ - Utils.nullArgumentCheck("resources", resources); //$NON-NLS-1$ - Utils.nullArgumentCheck("serverManager", serverManager); //$NON-NLS-1$ + CheckArg.isNotNull(type, "type"); //$NON-NLS-1$ + CheckArg.isNotNull(resources, "resources"); //$NON-NLS-1$ + CheckArg.isNotNull(serverManager, "serverManager"); //$NON-NLS-1$ this.type = type; this.page = new PublishPage(type, resources); this.serverManager = serverManager; - setWindowTitle((type == Type.PUBLISH) ? I18n.PublishWizardPublishTitle : I18n.PublishWizardUnpublishTitle); + setWindowTitle((type == Type.PUBLISH) ? RestClientI18n.publishWizardPublishTitle.text() + : RestClientI18n.publishWizardUnpublishTitle.text()); setDefaultPageImageDescriptor(Activator.getDefault().getImageDescriptor(DNA_WIZARD_BANNER_IMAGE_PATH)); } @@ -181,7 +181,8 @@ error = ((InvocationTargetException)e).getTargetException(); } - String message = (operation.isPublishing() ? I18n.PublishWizardPublishErrorMsg : I18n.PublishWizardUnpublishErrorMsg); + String message = (operation.isPublishing() ? RestClientI18n.publishWizardPublishErrorMsg.text() + : RestClientI18n.publishWizardUnpublishErrorMsg.text()); Activator.getDefault().log(new Status(Severity.ERROR, message, error)); } } finally { Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/wizards/PublishingResults.java =================================================================== --- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/wizards/PublishingResults.java 2009-08-10 18:34:03 UTC (rev 1159) +++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/wizards/PublishingResults.java 2009-08-10 21:31:32 UTC (rev 1160) @@ -26,14 +26,13 @@ import java.util.ArrayList; import java.util.List; import org.eclipse.core.resources.IFile; +import org.jboss.dna.common.util.CheckArg; import org.jboss.dna.web.jcr.rest.client.Status; -import org.jboss.dna.web.jcr.rest.client.Utils; import org.jboss.dna.web.jcr.rest.client.Status.Severity; -import org.jboss.dna.web.jcr.rest.client.swt.I18n; +import org.jboss.dna.web.jcr.rest.client.swt.RestClientI18n; import org.jboss.dna.web.jcr.rest.client.swt.wizards.PublishOperation.Type; /** - * @author Dan Florian * @since 0.6 */ public final class PublishingResults { @@ -48,7 +47,8 @@ * @since 0.6 */ private static final Status PUBLISH_NOT_ATTEMPTED_STATUS = new Status(Severity.INFO, - I18n.PublishingResultsPublishNotAttemptedMsg, null); + RestClientI18n.publishingResultsPublishNotAttemptedMsg.text(), + null); /** * Status indicating the file was not attempted to be published. @@ -56,7 +56,8 @@ * @since 0.6 */ private static final Status UNPUBLISH_NOT_ATTEMPTED_STATUS = new Status(Severity.INFO, - I18n.PublishingResultsUnpublishNotAttemptedMsg, null); + RestClientI18n.publishingResultsUnpublishNotAttemptedMsg.text(), + null); // =========================================================================================================================== // Fields @@ -123,14 +124,14 @@ // =========================================================================================================================== /** - * @param type the type of publishing operation + * @param type the type of publishing operation (never <code>null</code>) * @param files the files involved in the publishing operation (never <code>null</code>) * @since 0.6 */ public PublishingResults( Type type, List<IFile> files ) { - Utils.nullArgumentCheck("type", type); //$NON-NLS-1$ - Utils.nullArgumentCheck("files", files); //$NON-NLS-1$ + CheckArg.isNotNull(type, "type"); //$NON-NLS-1$ + CheckArg.isNotNull(files, "files"); //$NON-NLS-1$ this.type = type; this.files = files; @@ -142,13 +143,15 @@ // =========================================================================================================================== /** - * @param status the status being added + * @param status the status being added (never <code>null</code>) * @throws RuntimeException if the number of status objects is greater than the number of files * @since 0.6 */ public void addStatus( Status status ) { + CheckArg.isNotNull(status, "status"); //$NON-NLS-1$ + if (this.files.size() < (this.statuses.size() + 1)) { - throw new RuntimeException(I18n.PublishingResultsTooManyResultsMsg); + throw new RuntimeException(RestClientI18n.publishingResultsTooManyResultsMsg.text()); } this.statuses.add(status); @@ -157,7 +160,7 @@ else if (status.isInfo()) ++this.numInfos; else if (status.isOk()) ++this.numOks; else if (status.isWarning()) ++this.numWarnings; - else throw new RuntimeException(I18n.bind(I18n.PublishingResultsUnknownSeverityMsg, status.getSeverity())); + else throw new RuntimeException(RestClientI18n.publishingResultsUnknownSeverityMsg.text(status.getSeverity())); this.complete = (this.files.size() == this.statuses.size()); } @@ -186,7 +189,7 @@ } /** - * @return the files involved in the publishing operation + * @return the files involved in the publishing operation (never <code>null</code>) * @since 0.6 */ public List<IFile> getFiles() { @@ -215,7 +218,7 @@ * @since 0.6 */ public Status getStatus( IFile file ) { - Utils.nullArgumentCheck("file", file); //$NON-NLS-1$ + CheckArg.isNotNull(file, "file"); //$NON-NLS-1$ int index = this.files.indexOf(file); if (index == -1) { @@ -226,7 +229,8 @@ } /** - * @return the status of each file involved in the publishing operation + * @return the status of each file involved in the publishing operation (never <code>null</code> but can be incomplete) + * @see #isComplete() * @since 0.6 */ public List<Status> getStatuses() { @@ -234,7 +238,7 @@ } /** - * @return the publishing operation type + * @return the publishing operation type (never <code>null</code>) * @since 0.6 */ public Type getType() { Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/wizards/ServerPage.java =================================================================== --- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/wizards/ServerPage.java 2009-08-10 18:34:03 UTC (rev 1159) +++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/wizards/ServerPage.java 2009-08-10 21:31:32 UTC (rev 1160) @@ -43,10 +43,9 @@ import org.jboss.dna.web.jcr.rest.client.Status; import org.jboss.dna.web.jcr.rest.client.domain.Server; import org.jboss.dna.web.jcr.rest.client.domain.validation.ServerValidator; -import org.jboss.dna.web.jcr.rest.client.swt.I18n; +import org.jboss.dna.web.jcr.rest.client.swt.RestClientI18n; /** - * @author Dan Florian * @since 0.6 */ public final class ServerPage extends WizardPage { @@ -108,7 +107,7 @@ */ public ServerPage() { super(ServerPage.class.getSimpleName()); - setTitle(I18n.ServerPageTitle); + setTitle(RestClientI18n.serverPageTitle.text()); setPageComplete(false); } @@ -120,7 +119,7 @@ */ public ServerPage( Server server ) { super(ServerPage.class.getSimpleName()); - setTitle(I18n.ServerPageTitle); + setTitle(RestClientI18n.serverPageTitle.text()); this.server = server; this.url = server.getUrl(); @@ -135,18 +134,18 @@ private void constructAuthenticationPanel( Composite parent ) { Group pnl = new Group(parent, SWT.NONE); - pnl.setText(I18n.ServerPageAuthenticationGroupTitle); + pnl.setText(RestClientI18n.serverPageAuthenticationGroupTitle.text()); pnl.setLayout(new GridLayout(2, false)); pnl.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false)); { // user row Label lblUser = new Label(pnl, SWT.LEFT); lblUser.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false)); - lblUser.setText(I18n.ServerPageUserLabel); + lblUser.setText(RestClientI18n.serverPageUserLabel.text()); Text txtUser = new Text(pnl, SWT.BORDER); txtUser.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false)); - txtUser.setToolTipText(I18n.ServerPageUserToolTip); + txtUser.setToolTipText(RestClientI18n.serverPageUserToolTip.text()); // set initial value if (this.user != null) { @@ -164,11 +163,11 @@ { // password row Label lblPassword = new Label(pnl, SWT.LEFT); lblPassword.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false)); - lblPassword.setText(I18n.ServerPagePasswordLabel); + lblPassword.setText(RestClientI18n.serverPagePasswordLabel.text()); Text txtPassword = new Text(pnl, SWT.BORDER); txtPassword.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false)); - txtPassword.setToolTipText(I18n.ServerPagePasswordToolTip); + txtPassword.setToolTipText(RestClientI18n.serverPagePasswordToolTip.text()); txtPassword.setEchoChar('*'); // set initial value before hooking up listener @@ -189,8 +188,8 @@ final Button btn = new Button(pnl, SWT.CHECK | SWT.LEFT); btn.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false)); ((GridData)btn.getLayoutData()).horizontalSpan = 2; - btn.setText(I18n.ServerPageSavePasswordButton); - btn.setToolTipText(I18n.ServerPageSavePasswordToolTip); + btn.setText(RestClientI18n.serverPageSavePasswordButton.text()); + btn.setToolTipText(RestClientI18n.serverPageSavePasswordToolTip.text()); // set initial value before hooking up listeners if (this.savePassword) { @@ -221,7 +220,7 @@ lblImage.setImage(Display.getDefault().getSystemImage(SWT.ICON_INFORMATION)); StyledText st = new StyledText(pnl, SWT.READ_ONLY | SWT.MULTI | SWT.NO_FOCUS | SWT.WRAP); - st.setText(I18n.ServerPageSavePasswordLabel); + st.setText(RestClientI18n.serverPageSavePasswordLabel.text()); st.setBackground(Display.getDefault().getSystemColor(SWT.COLOR_WIDGET_BACKGROUND)); st.setCaret(null); GridData gd = new GridData(SWT.FILL, SWT.CENTER, true, true); @@ -240,11 +239,11 @@ Label lblUrl = new Label(pnl, SWT.LEFT); lblUrl.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false)); - lblUrl.setText(I18n.ServerPageUrlLabel); + lblUrl.setText(RestClientI18n.serverPageUrlLabel.text()); Text txtUrl = new Text(pnl, SWT.BORDER); txtUrl.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false)); - txtUrl.setToolTipText(I18n.ServerPageUrlToolTip); + txtUrl.setToolTipText(RestClientI18n.serverPageUrlToolTip.text()); // set initial value if (this.url != null) { @@ -286,7 +285,7 @@ } // should never be called if error status - throw new RuntimeException(I18n.ServerPageInvalidServerProperties); + throw new RuntimeException(RestClientI18n.serverPageInvalidServerProperties.text()); } /** @@ -344,7 +343,7 @@ * @since 0.6 */ void updateInitialMessage() { - if (I18n.ServerPageOkStatusMsg.equals(getMessage())) { + if (RestClientI18n.serverPageOkStatusMsg.text().equals(getMessage())) { updateState(); } } @@ -364,7 +363,7 @@ validate(); // set initial message - setMessage(I18n.ServerPageOkStatusMsg); + setMessage(RestClientI18n.serverPageOkStatusMsg.text()); } } @@ -389,7 +388,7 @@ } else if (this.status.isInfo()) { setMessage(this.status.getMessage(), IMessageProvider.INFORMATION); } else { - setMessage(I18n.ServerPageOkStatusMsg); + setMessage(RestClientI18n.serverPageOkStatusMsg.text()); } } } Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/wizards/ServerWizard.java =================================================================== --- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/wizards/ServerWizard.java 2009-08-10 18:34:03 UTC (rev 1159) +++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/wizards/ServerWizard.java 2009-08-10 21:31:32 UTC (rev 1160) @@ -30,10 +30,9 @@ import org.jboss.dna.web.jcr.rest.client.Status; import org.jboss.dna.web.jcr.rest.client.domain.Server; import org.jboss.dna.web.jcr.rest.client.swt.Activator; -import org.jboss.dna.web.jcr.rest.client.swt.I18n; +import org.jboss.dna.web.jcr.rest.client.swt.RestClientI18n; /** - * @author Dan Florian * @since 0.6 */ public final class ServerWizard extends Wizard { @@ -78,7 +77,7 @@ this.serverManager = serverManager; setDefaultPageImageDescriptor(Activator.getDefault().getImageDescriptor(DNA_WIZARD_BANNER_IMAGE_PATH)); - setWindowTitle(I18n.ServerWizardNewServerTitle); + setWindowTitle(RestClientI18n.serverWizardNewServerTitle.text()); } /** @@ -93,7 +92,7 @@ this.page = new ServerPage(server); this.serverManager = serverManager; this.existingServer = server; - setWindowTitle(I18n.ServerWizardEditServerTitle); + setWindowTitle(RestClientI18n.serverWizardEditServerTitle.text()); } // =========================================================================================================================== @@ -134,13 +133,17 @@ status = this.serverManager.addServer(server); if (status.isError()) { - MessageDialog.openError(getShell(), I18n.ErrorDialogTitle, I18n.ServerWizardEditServerErrorMsg); + MessageDialog.openError(getShell(), + RestClientI18n.errorDialogTitle.text(), + RestClientI18n.serverWizardEditServerErrorMsg.text()); } } else if (!this.existingServer.equals(server)) { status = this.serverManager.updateServer(this.existingServer, server); if (status.isError()) { - MessageDialog.openError(getShell(), I18n.ErrorDialogTitle, I18n.ServerWizardNewServerErrorMsg); + MessageDialog.openError(getShell(), + RestClientI18n.errorDialogTitle.text(), + RestClientI18n.serverWizardNewServerErrorMsg.text()); } } Added: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/wizards/package-info.java =================================================================== --- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/wizards/package-info.java (rev 0) +++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/wizards/package-info.java 2009-08-10 21:31:32 UTC (rev 1160) @@ -0,0 +1,28 @@ +/* + * JBoss DNA (http://www.jboss.org/dna) + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * See the AUTHORS.txt file in the distribution for a full listing of + * individual contributors. + * + * JBoss DNA is free software. Unless otherwise indicated, all code in JBoss DNA + * is licensed to you under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * JBoss DNA is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +/** + * The JBoss DNA REST Client Eclipse wizards package defines the Eclipse wizards that are needed to publish, unpublish, and manage + * the server registry. + */ +package org.jboss.dna.web.jcr.rest.client.swt.wizards; \ No newline at end of file Property changes on: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/wizards/package-info.java ___________________________________________________________________ Name: svn:mime-type + text/plain