[dna-commits] DNA SVN: r1242 - in branches/eclipse/org.jboss.dna.publish.ui.swt: META-INF and 13 other directories.
dna-commits at lists.jboss.org
dna-commits at lists.jboss.org
Tue Sep 22 11:03:26 EDT 2009
Author: elvisisking
Date: 2009-09-22 11:03:25 -0400 (Tue, 22 Sep 2009)
New Revision: 1242
Added:
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/Activator.java
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/DnaResourceHelper.java
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/IUiConstants.java
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/RestClientI18n.java
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/RestClientI18n.properties
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/Utils.java
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/actions/
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/dialogs/
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/jobs/
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/log/
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/package-info.java
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/preferences/
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/views/
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/wizards/
Removed:
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/DnaResourceHelper.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/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/Utils.java
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/actions/
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/dialogs/
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/jobs/
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/package-info.java
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/preferences/
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/views/
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/wizards/
Modified:
branches/eclipse/org.jboss.dna.publish.ui.swt/.project
branches/eclipse/org.jboss.dna.publish.ui.swt/META-INF/MANIFEST.MF
branches/eclipse/org.jboss.dna.publish.ui.swt/plugin.xml
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/actions/BasePublishingAction.java
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/actions/DeleteServerAction.java
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/actions/EditServerAction.java
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/actions/NewServerAction.java
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/actions/PublishAction.java
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/actions/ReconnectToServerAction.java
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/actions/ShowPublishedLocationsAction.java
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/actions/UnpublishAction.java
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/actions/package-info.java
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/dialogs/DeleteServerDialog.java
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/dialogs/PublishedLocationsDialog.java
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/dialogs/package-info.java
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/jobs/PublishJob.java
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/jobs/ReconnectJob.java
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/log/EclipseLogger.java
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/log/EclipseLoggerFactory.java
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/log/StaticLoggerBinder.java
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/preferences/DnaPreferencePage.java
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/preferences/FilteredFileExtensionEditor.java
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/preferences/FilteredFoldersEditor.java
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/preferences/NewItemDialog.java
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/preferences/PrefUtils.java
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/preferences/PublishingFileFilter.java
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/views/DnaContentProvider.java
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/views/DnaMessageConsole.java
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/views/ServerView.java
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/views/package-info.java
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/wizards/PublishPage.java
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/wizards/PublishWizard.java
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/wizards/ServerPage.java
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/wizards/ServerWizard.java
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/wizards/package-info.java
Log:
Package renaming prior to moving to trunk.
Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/.project
===================================================================
--- branches/eclipse/org.jboss.dna.publish.ui.swt/.project 2009-09-22 14:51:30 UTC (rev 1241)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/.project 2009-09-22 15:03:25 UTC (rev 1242)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.jboss.dna.web.jcr.rest.client.swt</name>
+ <name>org.jboss.dna.eclipse.jcr.rest.client</name>
<comment></comment>
<projects>
</projects>
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-09-22 14:51:30 UTC (rev 1241)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/META-INF/MANIFEST.MF 2009-09-22 15:03:25 UTC (rev 1242)
@@ -1,9 +1,9 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %bundleName
-Bundle-SymbolicName: org.jboss.dna.web.jcr.rest.client.swt;singleton:=true
+Bundle-SymbolicName: org.jboss.dna.eclipse.jcr.rest.client;singleton:=true
Bundle-Version: 1.0.0
-Bundle-Activator: org.jboss.dna.web.jcr.rest.client.swt.Activator
+Bundle-Activator: org.jboss.dna.eclipse.jcr.rest.client.Activator
Bundle-Vendor: %bundleVendor
Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui,
Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/plugin.xml
===================================================================
--- branches/eclipse/org.jboss.dna.publish.ui.swt/plugin.xml 2009-09-22 14:51:30 UTC (rev 1241)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/plugin.xml 2009-09-22 15:03:25 UTC (rev 1242)
@@ -6,10 +6,10 @@
<extension
point="org.eclipse.ui.popupMenus">
<objectContribution
- id="org.jboss.dna.web.jcr.rest.client.swt.iresourcepopupmenucontribution"
+ id="org.jboss.dna.eclipse.jcr.rest.client.iresourcepopupmenucontribution"
objectClass="org.eclipse.core.resources.IResource">
<menu
- id="org.jboss.dna.web.jcr.rest.client.swt.contextMenu"
+ id="org.jboss.dna.eclipse.jcr.rest.client.contextMenu"
label="%contextMenu.label"
path="additions">
<separator
@@ -19,27 +19,27 @@
<!-- Show Published Locations action -->
<action
- id="org.jboss.dna.web.jcr.rest.client.swt.showPublishedLocationsAction"
+ id="org.jboss.dna.eclipse.jcr.rest.client.showPublishedLocationsAction"
label="%showPublishedLocationsAction.label"
- class="org.jboss.dna.web.jcr.rest.client.swt.actions.ShowPublishedLocationsAction"
+ class="org.jboss.dna.eclipse.jcr.rest.client.actions.ShowPublishedLocationsAction"
icon="icons/views/blank.gif"
- menubarPath="org.jboss.dna.web.jcr.rest.client.swt.contextMenu/group1"
+ menubarPath="org.jboss.dna.eclipse.jcr.rest.client.contextMenu/group1"
enablesFor="1">
<enablement>
<and>
<objectClass name="org.eclipse.core.resources.IFile" />
- <objectState name="persistentProperty" value="org.jboss.dna.web.jcr.rest.client.swt.publishedIn" />
+ <objectState name="persistentProperty" value="org.jboss.dna.eclipse.jcr.rest.client.publishedIn" />
</and>
</enablement>
</action>
<!-- Unpublish action -->
<action
- id="org.jboss.dna.web.jcr.rest.client.swt.unpublishAction"
+ id="org.jboss.dna.eclipse.jcr.rest.client.unpublishAction"
label="%unpublishAction.label"
- class="org.jboss.dna.web.jcr.rest.client.swt.actions.UnpublishAction"
+ class="org.jboss.dna.eclipse.jcr.rest.client.actions.UnpublishAction"
icon="icons/views/unpublish.png"
- menubarPath="org.jboss.dna.web.jcr.rest.client.swt.contextMenu/group1"
+ menubarPath="org.jboss.dna.eclipse.jcr.rest.client.contextMenu/group1"
enablesFor="*">
<enablement>
<or>
@@ -55,11 +55,11 @@
<!-- Publish action -->
<action
- id="org.jboss.dna.web.jcr.rest.client.swt.publishAction"
+ id="org.jboss.dna.eclipse.jcr.rest.client.publishAction"
label="%publishAction.label"
- class="org.jboss.dna.web.jcr.rest.client.swt.actions.PublishAction"
+ class="org.jboss.dna.eclipse.jcr.rest.client.actions.PublishAction"
icon="icons/views/publish.png"
- menubarPath="org.jboss.dna.web.jcr.rest.client.swt.contextMenu/group1"
+ menubarPath="org.jboss.dna.eclipse.jcr.rest.client.contextMenu/group1"
enablesFor="*">
<enablement>
<or>
@@ -88,7 +88,7 @@
id="serverView"
name="%serverView"
category="org.jboss.dna"
- class="org.jboss.dna.web.jcr.rest.client.swt.views.ServerView"
+ class="org.jboss.dna.eclipse.jcr.rest.client.views.ServerView"
fastViewWidthRatio="0.25"
icon="icons/objects/server.gif">
</view>
@@ -103,8 +103,8 @@
adaptable="true"
label="%decorator.label"
state="true"
- class="org.jboss.dna.web.jcr.rest.client.swt.views.DnaContentProvider"
- id="org.jboss.dna.web.jcr.rest.client.swt.dnaDecorator">
+ class="org.jboss.dna.eclipse.jcr.rest.client.views.DnaContentProvider"
+ id="org.jboss.dna.eclipse.jcr.rest.client.dnaDecorator">
<description>
%decorator.description
</description>
@@ -136,7 +136,7 @@
point="org.eclipse.ui.preferencePages">
<page
name="%dnaCategory"
- class="org.jboss.dna.web.jcr.rest.client.swt.preferences.DnaPreferencePage"
+ class="org.jboss.dna.eclipse.jcr.rest.client.preferences.DnaPreferencePage"
id="dnaPreferencePage">
</page>
</extension>
Copied: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/Activator.java (from rev 1241, 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/eclipse/jcr/rest/client/Activator.java (rev 0)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/Activator.java 2009-09-22 15:03:25 UTC (rev 1242)
@@ -0,0 +1,279 @@
+/*
+ * 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.eclipse.jcr.rest.client;
+
+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;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.ui.ISharedImages;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+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;
+import org.jboss.dna.web.jcr.rest.client.domain.IDnaObject;
+import org.jboss.dna.web.jcr.rest.client.domain.Repository;
+import org.jboss.dna.web.jcr.rest.client.domain.Server;
+import org.jboss.dna.web.jcr.rest.client.domain.Workspace;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The <code>Activator</code> controls the plug-in life cycle, provides utility functions, and keeps track of the
+ * {@link ServerManager}.
+ */
+public final class Activator extends AbstractUIPlugin implements IUiConstants {
+
+ // ===========================================================================================================================
+ // Class Fields
+ // ===========================================================================================================================
+
+ /**
+ * The shared plugin instance.
+ */
+ private static Activator plugin;
+
+ // ===========================================================================================================================
+ // Class Methods
+ // ===========================================================================================================================
+
+ /**
+ * @return the shared instance or <code>null</code> if not constructed
+ */
+ public static Activator getDefault() {
+ return plugin;
+ }
+
+ // ===========================================================================================================================
+ // Fields
+ // ===========================================================================================================================
+
+ /**
+ * The image used when the requested image cannot be found.
+ */
+ private Image missingImage;
+
+ /**
+ * The manager in charge of the server registry.
+ */
+ private ServerManager serverMgr;
+
+ // ===========================================================================================================================
+ // 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
+ */
+ 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, RestClientI18n.missingImage.text(key), e));
+ return null;
+ }
+ }
+
+ /**
+ * @return the image to use when a requested image cannot be found
+ */
+ private Image getMissingImage() {
+ if (this.missingImage == null) {
+ this.missingImage = ImageDescriptor.getMissingImageDescriptor().createImage();
+ }
+
+ return this.missingImage;
+ }
+
+ /**
+ * @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
+ */
+ 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 (never <code>null</code>)
+ * @return the image descriptor or a descriptor indicating the requested descriptor could not be found
+ * @see ISharedImages
+ */
+ public ImageDescriptor getSharedImageDescriptor( String imageId ) {
+ CheckArg.isNotNull(imageId, "imageId"); //$NON-NLS-1$
+ ImageDescriptor result = PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(imageId);
+
+ if (result != null) {
+ return result;
+ }
+
+ return ImageDescriptor.getMissingImageDescriptor();
+ }
+
+ /**
+ * @param object the object whose image is being requested (domain object or plugin-relative path)
+ * @return the image or <code>null</code> if not found
+ */
+ public Image getImage( Object object ) {
+ String key = null;
+
+ if (object instanceof Workspace) {
+ key = WORKSPACE_IMAGE;
+ } else if (object instanceof Repository) {
+ key = REPOSITORY_IMAGE;
+ } else if (object instanceof Server) {
+ key = SERVER_IMAGE;
+ } else if (object instanceof IDnaObject) {
+ // should have an icon for every business object
+ assert false;
+ } else if (object instanceof String) {
+ key = (String)object;
+ }
+
+ if (key != null) {
+ ImageRegistry registry = getImageRegistry();
+ Image image = registry.get(key);
+
+ if (image == null) {
+ ImageDescriptor descriptor = createImageDescriptor(key);
+
+ if (descriptor == null) {
+ return getMissingImage();
+ }
+
+ image = descriptor.createImage();
+ registry.put(key, image);
+ }
+
+ return image;
+ }
+
+ return null;
+ }
+
+ /**
+ * @param object the object whose image descriptor is being requested
+ * @return the image descriptor or <code>null</code> if not found
+ */
+ public ImageDescriptor getImageDescriptor( Object object ) {
+ String key = null;
+
+ if (object instanceof Workspace) {
+ key = WORKSPACE_IMAGE;
+ } else if (object instanceof Repository) {
+ key = REPOSITORY_IMAGE;
+ } else if (object instanceof Server) {
+ key = SERVER_IMAGE;
+ } else if (object instanceof IDnaObject) {
+ // should have an icon for every business object
+ assert false;
+ } else if (object instanceof String) {
+ key = (String)object;
+ }
+
+ if (key != null) {
+ ImageDescriptor descriptor = AbstractUIPlugin.imageDescriptorFromPlugin(PLUGIN_ID, ((String)object));
+ return ((descriptor == null) ? ImageDescriptor.getMissingImageDescriptor() : descriptor);
+ }
+
+ return null;
+ }
+
+ /**
+ * @return the server manager or <code>null</code> if activator has not been initialized or started
+ * @see #start(BundleContext)
+ */
+ public ServerManager getServerManager() {
+ return this.serverMgr;
+ }
+
+ /**
+ * @param status the status being logged (never <code>null</code>)
+ */
+ 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());
+ getLog().log(eclipseStatus);
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+ */
+ @Override
+ public void start( BundleContext context ) throws Exception {
+ BasicConfigurator.configure();
+
+ super.start(context);
+ plugin = this;
+
+ this.serverMgr = new ServerManager(getStateLocation().toFile().getAbsolutePath());
+ Status status = this.serverMgr.restoreState();
+
+ // problem restoring server registry
+ if (!status.isOk()) {
+ log(status);
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+ */
+ @Override
+ public void stop( BundleContext context ) throws Exception {
+ if (missingImage != null) {
+ missingImage.dispose();
+ }
+
+ if (this.serverMgr != null) {
+ Status status = this.serverMgr.saveState();
+
+ if (!status.isOk()) {
+ log(status);
+ }
+
+ this.serverMgr = null;
+ }
+
+ super.stop(context);
+
+ plugin = null;
+ }
+
+}
Property changes on: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/Activator.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/DnaResourceHelper.java (from rev 1241, branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/DnaResourceHelper.java)
===================================================================
--- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/DnaResourceHelper.java (rev 0)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/DnaResourceHelper.java 2009-09-22 15:03:25 UTC (rev 1242)
@@ -0,0 +1,246 @@
+/*
+ * 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.eclipse.jcr.rest.client;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.StringTokenizer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.QualifiedName;
+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;
+import org.jboss.dna.web.jcr.rest.client.domain.Repository;
+import org.jboss.dna.web.jcr.rest.client.domain.Server;
+import org.jboss.dna.web.jcr.rest.client.domain.Workspace;
+
+/**
+ * The <code>DnaResourceHelper</code> knows how to get and set the property on a resource that indicates it has been published to
+ * one or more workspaces.
+ */
+public final class DnaResourceHelper {
+
+ // ===========================================================================================================================
+ // Constants
+ // ===========================================================================================================================
+
+ /**
+ * Delimiter between a workspace's properties.
+ */
+ private static final String ID_DELIM = "$"; //$NON-NLS-1$
+
+ /**
+ * Delimiter between workspaces.
+ */
+ private static final String DELIM = "|"; //$NON-NLS-1$
+
+ /**
+ * The name of the persisted file property indicating if the resource has been published. This property will only exist if the
+ * file has been published to at least one DNA repository. The value of the property is a list of DNA repository workspaces
+ * where this file has been published.
+ */
+ private static QualifiedName PUBLISHED_RESOURCE_PROPERTY = new QualifiedName(IUiConstants.PLUGIN_ID, "publishedIn"); //$NON-NLS-1$
+
+ // ===========================================================================================================================
+ // Fields
+ // ===========================================================================================================================
+
+ /**
+ * The server manager used by the helper to obtain workspaces.
+ */
+ private final ServerManager serverManager;
+
+ // ===========================================================================================================================
+ // Constructors
+ // ===========================================================================================================================
+
+ /**
+ * @param serverManager the server manager used by this helper (never <code>null</code>)
+ */
+ public DnaResourceHelper( ServerManager serverManager ) {
+ CheckArg.isNotNull(serverManager, "serverManager"); //$NON-NLS-1$
+ this.serverManager = serverManager;
+ }
+
+ // ===========================================================================================================================
+ // Methods
+ // ===========================================================================================================================
+
+ /**
+ * @param file the file that was just published
+ * @param workspace the workspace where the file was published
+ * @throws Exception if there is a problem setting the property
+ */
+ public void addPublishedProperty( IFile file,
+ Workspace workspace ) throws Exception {
+ CheckArg.isNotNull(file, "file"); //$NON-NLS-1$
+ CheckArg.isNotNull(workspace, "workspace"); //$NON-NLS-1$
+
+ Set<Workspace> workspaces = getPublishedOnWorkspaces(file);
+ workspaces.add(workspace);
+
+ // set new value
+ setPublishedOnPropertyValue(file, workspaces);
+ }
+
+ /**
+ * @param workspaces the workspaces used to create the property value
+ * @return the property value
+ */
+ private String createPublishedPropertyValue( Set<Workspace> workspaces ) {
+ StringBuilder value = new StringBuilder();
+
+ for (Workspace workspace : workspaces) {
+ value.append(createWorkspaceId(workspace)).append(DELIM);
+ }
+
+ return value.toString();
+ }
+
+ /**
+ * @param workspace the workspace whose identifier is being created
+ * @return the ID
+ */
+ private String createWorkspaceId( Workspace workspace ) {
+ StringBuilder result = new StringBuilder();
+ result.append(workspace.getServer().getUrl()).append(ID_DELIM).append(workspace.getServer().getUser()).append(ID_DELIM);
+ result.append(workspace.getRepository().getName()).append(ID_DELIM);
+ result.append(workspace.getName());
+
+ return result.toString();
+ }
+
+ /**
+ * @param file the file whose <code>Workspace</code>s it has been published on is being requested (never <code>null</code>)
+ * @return the workspaces (never <code>null</code>)
+ * @throws Exception if there is a problem reading one of the file's persistent properties or a problem with the server
+ * manager
+ */
+ public Set<Workspace> getPublishedOnWorkspaces( IFile file ) throws Exception {
+ CheckArg.isNotNull(file, "file"); //$NON-NLS-1$
+
+ Set<Workspace> publishedOnWorkspaces = null;
+ String value = file.getPersistentProperty(PUBLISHED_RESOURCE_PROPERTY);
+
+ if (value == null) {
+ publishedOnWorkspaces = new HashSet<Workspace>(1);
+ } else {
+ StringTokenizer wsTokenizer = new StringTokenizer(value, DELIM);
+ publishedOnWorkspaces = new HashSet<Workspace>(wsTokenizer.countTokens());
+
+ while (wsTokenizer.hasMoreTokens()) {
+ StringTokenizer propsTokenizer = new StringTokenizer(wsTokenizer.nextToken(), ID_DELIM);
+
+ PARSE_WORKSPACE: while (propsTokenizer.hasMoreTokens()) {
+ String url = propsTokenizer.nextToken();
+ String user = propsTokenizer.nextToken();
+ Server server = this.serverManager.findServer(url, user);
+
+ if ((server != null) && this.serverManager.ping(server).isOk()) {
+ Collection<Repository> repositories = this.serverManager.getRepositories(server);
+
+ if (!repositories.isEmpty()) {
+ String repositoryName = propsTokenizer.nextToken();
+
+ for (Repository repository : repositories) {
+ if (repository.getName().equals(repositoryName)) {
+ Collection<Workspace> workspaces = this.serverManager.getWorkspaces(repository);
+
+ if (!workspaces.isEmpty()) {
+ String workspaceName = propsTokenizer.nextToken();
+
+ for (Workspace workspace : workspaces) {
+ if (workspace.getName().equals(workspaceName)) {
+ publishedOnWorkspaces.add(workspace);
+ break PARSE_WORKSPACE;
+ }
+ }
+ }
+
+ }
+ }
+ }
+ } else {
+ // this will remove workspace as being one that the file has been published on
+ break PARSE_WORKSPACE;
+ }
+ }
+ }
+ }
+
+ return publishedOnWorkspaces;
+ }
+
+ /**
+ * @param file the file whose published status is being requested (never <code>null</code>)
+ * @return <code>true</code> if the file has been published to any DNA repository
+ */
+ public boolean isPublished( IFile file ) {
+ CheckArg.isNotNull(file, "file"); //$NON-NLS-1$
+
+ try {
+ return !getPublishedOnWorkspaces(file).isEmpty();
+ } catch (Exception e) {
+ Activator.getDefault().log(new Status(Severity.ERROR, RestClientI18n.publishedResourcePropertyErrorMsg.text(file), e));
+ }
+
+ return false;
+ }
+
+ /**
+ * @param file the file that was just unpublished
+ * @param workspace the workspace where the file was unpublished
+ * @throws Exception if there is a problem setting the property
+ */
+ public void removePublishedProperty( IFile file,
+ Workspace workspace ) throws Exception {
+ CheckArg.isNotNull(file, "file"); //$NON-NLS-1$
+ CheckArg.isNotNull(workspace, "workspace"); //$NON-NLS-1$
+
+ Set<Workspace> workspaces = getPublishedOnWorkspaces(file);
+ workspaces.remove(workspace);
+
+ // set new value
+ setPublishedOnPropertyValue(file, workspaces);
+ }
+
+ /**
+ * @param file the file whose property is being set
+ * @param workspaces the workspaces the file has been published to or <code>null</code> if the file has not been published
+ * @throws CoreException if there was a problem setting the property
+ */
+ private void setPublishedOnPropertyValue( IFile file,
+ Set<Workspace> workspaces ) throws CoreException {
+ if ((workspaces == null) || workspaces.isEmpty()) {
+ file.setPersistentProperty(PUBLISHED_RESOURCE_PROPERTY, null);
+ } else {
+ String value = createPublishedPropertyValue(workspaces);
+ file.setPersistentProperty(PUBLISHED_RESOURCE_PROPERTY, value);
+ }
+ }
+
+}
Property changes on: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/DnaResourceHelper.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/IUiConstants.java (from rev 1241, 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/eclipse/jcr/rest/client/IUiConstants.java (rev 0)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/IUiConstants.java 2009-09-22 15:03:25 UTC (rev 1242)
@@ -0,0 +1,124 @@
+/*
+ * 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.eclipse.jcr.rest.client;
+
+public interface IUiConstants {
+
+ /**
+ * The Plug-in's identifier.
+ */
+ String PLUGIN_ID = "org.jboss.dna.eclipse.jcr.rest.client"; //$NON-NLS-1$
+
+ String ICON_FOLDER = "icons/"; //$NON-NLS-1$
+
+ //
+ // /icons/objects/
+ //
+
+ String OBJECT_ICONS_FOLDER = ICON_FOLDER + "objects/"; //$NON-NLS-1$
+
+ String CHECKMARK_IMAGE = OBJECT_ICONS_FOLDER + "checkmark.gif"; //$NON-NLS-1$
+
+ String REPOSITORY_IMAGE = OBJECT_ICONS_FOLDER + "repository.gif"; //$NON-NLS-1$
+
+ String SERVER_IMAGE = OBJECT_ICONS_FOLDER + "server.gif"; //$NON-NLS-1$
+
+ String WORKSPACE_IMAGE = OBJECT_ICONS_FOLDER + "workspace.gif"; //$NON-NLS-1$
+
+ //
+ // /icons/views/
+ //
+
+ String VIEWS_ICON_FOLDER = ICON_FOLDER + "views/"; //$NON-NLS-1$
+
+ String BLANK_IMAGE = VIEWS_ICON_FOLDER + "blank.gif"; //$NON-NLS-1$
+
+ String COLLAPSE_ALL_IMAGE = VIEWS_ICON_FOLDER + "collapse_all.gif"; //$NON-NLS-1$
+
+ String DELETE_SERVER_IMAGE = VIEWS_ICON_FOLDER + "delete_server.gif"; //$NON-NLS-1$
+
+ String DNA_IMAGE_16x = VIEWS_ICON_FOLDER + "dna_icon_16x.png"; //$NON-NLS-1$
+
+ String EDIT_SERVER_IMAGE = VIEWS_ICON_FOLDER + "edit_server.gif"; //$NON-NLS-1$
+
+ String ERROR_OVERLAY_IMAGE = VIEWS_ICON_FOLDER + "error_overlay.gif"; //$NON-NLS-1$
+
+ String NEW_SERVER_IMAGE = VIEWS_ICON_FOLDER + "new_server.gif"; //$NON-NLS-1$
+
+ String PUBLISH_IMAGE = VIEWS_ICON_FOLDER + "publish.png"; //$NON-NLS-1$
+
+ String PUBLISHED_OVERLAY_IMAGE = VIEWS_ICON_FOLDER + "published_overlay.png"; //$NON-NLS-1$
+
+ String REFRESH_IMAGE = VIEWS_ICON_FOLDER + "refresh.gif"; //$NON-NLS-1$
+
+ String UNPUBLISH_IMAGE = VIEWS_ICON_FOLDER + "unpublish.png"; //$NON-NLS-1$
+
+ //
+ // /icons/wizards/
+ //
+
+ String WIZARD_ICONS_FOLDER = ICON_FOLDER + "wizards/"; //$NON-NLS-1$
+
+ String DNA_WIZARD_BANNER_IMAGE = WIZARD_ICONS_FOLDER + "dna_wizard_banner.gif"; //$NON-NLS-1$
+
+ //
+ // Help Contexts
+ //
+
+ String HELP_CONTEXT_PREFIX = PLUGIN_ID + '.';
+
+ String DNA_CONSOLE_HELP_CONTEXT = HELP_CONTEXT_PREFIX + "dnaConsoleHelpContext"; //$NON-NLS-1$
+
+ String PREFERENCE_PAGE_HELP_CONTEXT = HELP_CONTEXT_PREFIX + "preferencesHelpContext"; //$NON-NLS-1$
+
+ String PUBLISH_DIALOG_HELP_CONTEXT = HELP_CONTEXT_PREFIX + "publishDialogHelpContext"; //$NON-NLS-1$
+
+ String SERVER_DIALOG_HELP_CONTEXT = HELP_CONTEXT_PREFIX + "serverDialogHelpContext"; //$NON-NLS-1$
+
+ String SERVER_VIEW_HELP_CONTEXT = HELP_CONTEXT_PREFIX + "serverViewHelpContext"; //$NON-NLS-1$
+
+ //
+ // Jobs
+ //
+
+ /**
+ * The <code>Job</code> framework job family for the DNA publishing and unpublishing operations.
+ */
+ String DNA_PUBLISHING_JOB_FAMILY = "dna.publishing.job.family"; //$NON-NLS-1$
+
+ //
+ // Preferences
+ //
+
+ /**
+ * A preference for a list of file extensions that will not be part of publishing operations.
+ */
+ String FILTERED_FILE_EXTENSIONS_PREFERENCE = "dna.preference.filteredFileExtensions"; //$NON-NLS-1$
+
+ /**
+ * A preference for a list of folder names whose contents will not be part of publishing operations.
+ */
+ String FILTERED_FOLDER_NAMES_PREFERENCE = "dna.preference.filteredFolderNames"; //$NON-NLS-1$
+
+}
Property changes on: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/IUiConstants.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/RestClientI18n.java (from rev 1241, 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/eclipse/jcr/rest/client/RestClientI18n.java (rev 0)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/RestClientI18n.java 2009-09-22 15:03:25 UTC (rev 1242)
@@ -0,0 +1,193 @@
+/*
+ * 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.eclipse.jcr.rest.client;
+
+import org.jboss.dna.common.i18n.I18n;
+
+/**
+ * The <code>RestClientI18n</code> class provides localized messages.
+ */
+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 dnaConsoleName;
+ public static I18n dnaConsoleProblemCreatingHyperlinkMsg;
+ public static I18n dnaConsoleFilePathNotFoundMsg;
+
+ public static I18n dnaPreferencePageDescription;
+ public static I18n dnaPreferencePageFilteredFileExtensionsLabel;
+ public static I18n dnaPreferencePageFilteredFolderNamesLabel;
+ public static I18n dnaPreferencePageMessage;
+ public static I18n dnaPreferencePageTitle;
+
+ public static I18n editServerActionText;
+ public static I18n editServerActionToolTip;
+
+ public static I18n errorDialogTitle;
+
+ public static I18n missingImage;
+
+ public static I18n newFilteredFileExtensionDialogLabel;
+ public static I18n newFilteredFileExtensionDialogTitle;
+
+ public static I18n newFilteredFolderNameDialogLabel;
+ public static I18n newFilteredFolderNameDialogTitle;
+
+ public static I18n newServerActionText;
+ public static I18n newServerActionToolTip;
+
+ public static I18n prefUtilsPropertyFileNotFound;
+ public static I18n prefUtilsPropertyNotFound;
+
+ public static I18n publishedLocationsDialogCopyUrlButton;
+ public static I18n publishedLocationsDialogCopyUrlButtonToolTip;
+ public static I18n publishedLocationsDialogErrorObtainingUrlMsg;
+ public static I18n publishedLocationsDialogFileUrlColumnHeader;
+ public static I18n publishedLocationsDialogMsg;
+ public static I18n publishedLocationsDialogRepositoryColumnHeader;
+ public static I18n publishedLocationsDialogServerUrlColumnHeader;
+ public static I18n publishedLocationsDialogTitle;
+ public static I18n publishedLocationsDialogUserColumnHeader;
+ public static I18n publishedLocationsDialogWorkspaceColumnHeader;
+
+ public static I18n publishedResourcePropertyErrorMsg;
+
+ public static I18n publishJobCanceled;
+ public static I18n publishJobDurationMsg;
+ public static I18n publishJobDurationNoHoursMsg;
+ public static I18n publishJobDurationNoHoursNoMinutesMsg;
+ public static I18n publishJobDurationShortMsg;
+ public static I18n publishJobPublish;
+ public static I18n publishJobPublishCanceledMsg;
+ public static I18n publishJobPublishFile;
+ public static I18n publishJobPublishFileFailed;
+ public static I18n publishJobPublishFileInfo;
+ public static I18n publishJobPublishFileWarning;
+ public static I18n publishJobPublishFinishedMsg;
+ public static I18n publishJobPublishName;
+ public static I18n publishJobPublishTaskName;
+ public static I18n publishJobUnexpectedErrorMsg;
+ public static I18n publishJobUnpublish;
+ public static I18n publishJobUnpublishCanceledMsg;
+ public static I18n publishJobUnpublishFile;
+ public static I18n publishJobUnpublishFileFailed;
+ public static I18n publishJobUnpublishFileInfo;
+ public static I18n publishJobUnpublishFileWarning;
+ public static I18n publishJobUnpublishFinishedMsg;
+ public static I18n publishJobUnpublishName;
+ public static I18n publishJobUnpublishTaskName;
+
+ 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 publishWizardPublishErrorMsg;
+ public static I18n publishWizardPublishTitle;
+ public static I18n publishWizardUnpublishTitle;
+ public static I18n publishWizardUnpublishErrorMsg;
+
+ public static I18n reconnectJobTaskName;
+
+ 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 serverPageTestConnectionLabel;
+ public static I18n serverPageTestConnectionButton;
+ public static I18n serverPageTestConnectionButtonToolTip;
+ public static I18n serverPageTestConnectionDialogFailureMsg;
+ public static I18n serverPageTestConnectionDialogTitle;
+ public static I18n serverPageTestConnectionDialogSuccessMsg;
+ public static I18n serverPageTitle;
+ public static I18n serverPageUrlLabel;
+ public static I18n serverPageUrlToolTip;
+ public static I18n serverPageUserLabel;
+ public static I18n serverPageUserToolTip;
+
+ public static I18n serverReconnectActionText;
+ public static I18n serverReconnectActionToolTip;
+
+ public static I18n serverViewToolTip;
+
+ public static I18n serverWizardEditServerErrorMsg;
+ public static I18n serverWizardEditServerTitle;
+ public static I18n serverWizardNewServerErrorMsg;
+ public static I18n serverWizardNewServerTitle;
+
+ public static I18n showPublishedLocationsErrorMsg;
+
+ public static I18n testServerActionText;
+ public static I18n testServerActionToolTip;
+
+ 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/eclipse/jcr/rest/client/RestClientI18n.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/RestClientI18n.properties (from rev 1241, 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/eclipse/jcr/rest/client/RestClientI18n.properties (rev 0)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/RestClientI18n.properties 2009-09-22 15:03:25 UTC (rev 1242)
@@ -0,0 +1,174 @@
+#
+# 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 = Discard
+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 server with URL of "{0}" and user "{1}?"
+deleteServerDialogTitle = Confirm Delete Server
+
+editServerActionText = Server Properties
+editServerActionToolTip = Edit server properties
+
+dnaConsoleName = DNA
+dnaConsoleProblemCreatingHyperlinkMsg = Unexpected problem creating hyperlink in DNA Console view
+dnaConsoleFilePathNotFoundMsg = A hyperlink could not be created in the DNA Message Console because the file path of "{0}" could not be found.
+
+dnaPreferencePageDescription = Add or remove filtered file extensions and folder names. Files with a matching file extension or files that are contained in a folder with a matching name will NOT be published to or unpublished from DNA repositories.
+dnaPreferencePageFilteredFileExtensionsLabel = Filtered File Extensions:
+dnaPreferencePageFilteredFolderNamesLabel = Filtered Folder Names:
+dnaPreferencePageMessage = DNA
+dnaPreferencePageTitle = DNA Preferences
+
+errorDialogTitle = Error
+
+missingImage = The following image cannot be found "{0}"
+
+newFilteredFileExtensionDialogLabel = File extension:
+newFilteredFileExtensionDialogTitle = New Filtered File Extension
+
+newFilteredFolderNameDialogLabel = Folder name:
+newFilteredFolderNameDialogTitle = New Filtered Folder Name
+
+newServerActionText = New Server
+newServerActionToolTip = Create a new server
+
+prefUtilsPropertyFileNotFound = The "{0}" property preference file is missing or could not be loaded. All property default values will be used.
+prefUtilsPropertyNotFound = The "{0}" property is missing. Default value of "{1}" will be used.
+
+publishedLocationsDialogCopyUrlButton = Copy URL
+publishedLocationsDialogCopyUrlButtonToolTip = Copy to the clipboard the selected workspace URL where the file is published
+publishedLocationsDialogErrorObtainingUrlMsg = Error obtaining URL
+publishedLocationsDialogFileUrlColumnHeader = Published URL
+publishedLocationsDialogMsg = The file "{0}" has been published to the following DNA workspaces:
+publishedLocationsDialogRepositoryColumnHeader = Repository
+publishedLocationsDialogServerUrlColumnHeader = Server URL
+publishedLocationsDialogTitle = Published Locations
+publishedLocationsDialogUserColumnHeader = User
+publishedLocationsDialogWorkspaceColumnHeader = Workspace
+
+publishedResourcePropertyErrorMsg = Error obtaining the "published" property from the resource "{0}"
+
+publishJobCanceled = Job {0} was canceled. See log for details.
+publishJobDurationMsg = {0} hour(s), {1} minute(s), {2} second(s)
+publishJobDurationNoHoursMsg = {0} minute(s), {1} second(s)
+publishJobDurationNoHoursNoMinutesMsg = {0} second(s)
+publishJobDurationShortMsg = less than 1 second
+publishJobPublish = [{0}] Publishing {4} file(s) to server "{1}" (repository "{2}", workspace "{3}") ...
+publishJobPublishCanceledMsg = [{0}] Publishing was canceled after {1} file(s) out of {2} were processed. Elapsed time: {3}.\n
+publishJobPublishFile = [{0}] + Published file "{1}" to URL "<em>{2}</em>"
+publishJobPublishFileFailed = [{0}] -- ERROR -- Publishing file "{1}" generated an ERROR message. See log.
+publishJobPublishFileInfo = [{0}] -- INFO -- Publishing file "{1}" generated an INFO message. See log.
+publishJobPublishFileWarning = [{0}] -- WARNING -- Publishing file "{1}" generated a WARNING message. See log.
+publishJobPublishFinishedMsg = [{0}] Done publishing. Elapsed time: {1}.\n
+publishJobPublishName = DNA Publish [{0}]
+publishJobPublishTaskName = Publishing resources [{0}]
+publishJobUnexpectedErrorMsg = Unexpected error occurred. See log for more details.
+publishJobUnpublish = [{0}] Unpublishing {4} file(s) from server "{1}" (repository "{2}", workspace "{3}") ...
+publishJobUnpublishCanceledMsg = [{0}] Unublishing was canceled after {1} file(s) out of {2} were processed. Elapsed time: {3}.\n
+publishJobUnpublishFile = [{0}] - Unpublished file "{1}"
+publishJobUnpublishFileFailed = [{0}] -- ERROR -- Unpublishing file "{0}" generated an ERROR message. See log.
+publishJobUnpublishFileInfo = [{0}] -- INFO -- Unpublishing file "{1}" generated an INFO message. See log.
+publishJobUnpublishFileWarning = [{0}] -- WARN -- Unpublishing file "{1}" generated a WARNING message. See log.
+publishJobUnpublishFinishedMsg = [{0}] Done unpublishing. Elapsed time: {1}. \n
+publishJobUnpublishName = DNA Unpublish [{0}]
+publishJobUnpublishTaskName = Unpublishing resources [{0}]
+
+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 resources will be published. 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 resources will be unpublished. 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
+
+publishWizardPublishErrorMsg = Error Publishing
+publishWizardPublishTitle = Publish
+publishWizardUnpublishErrorMsg = Error Unpublishing
+publishWizardUnpublishTitle = Unpublish
+
+reconnectJobTaskName = Connecting to server "{0}"
+
+serverReconnectActionText = Reconnect
+serverReconnectActionToolTip = Reconnect to the selected server
+
+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
+serverPageTestConnectionLabel = Validate server connection:
+serverPageTestConnectionButton = Test
+serverPageTestConnectionButtonToolTip = Try to establish a connection to the server
+serverPageTestConnectionDialogFailureMsg = Unable to connect using the specified server properties. The server properties could be invalid or the server may be offline.
+serverPageTestConnectionDialogTitle = Test Server Connection
+serverPageTestConnectionDialogSuccessMsg = Successfully connected using the specified server properties.
+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
+
+showPublishedLocationsErrorMsg = Unexpected problem showing published on locations. See log for more details.
+
+testServerActionText = Connect
+testServerActionToolTip = Connect to the server identified by the abover URL, user, and password
Property changes on: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/RestClientI18n.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/Utils.java (from rev 1241, 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/eclipse/jcr/rest/client/Utils.java (rev 0)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/Utils.java 2009-09-22 15:03:25 UTC (rev 1242)
@@ -0,0 +1,223 @@
+/*
+ * 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.eclipse.jcr.rest.client;
+
+import static org.jboss.dna.eclipse.jcr.rest.client.IUiConstants.PLUGIN_ID;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.StringTokenizer;
+import java.util.TreeSet;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.ISharedImages;
+import org.jboss.dna.common.util.CheckArg;
+import org.jboss.dna.web.jcr.rest.client.Status;
+import org.jboss.dna.web.jcr.rest.client.Status.Severity;
+
+public final class Utils {
+
+ // ===========================================================================================================================
+ // Class Methods
+ // ===========================================================================================================================
+
+ /**
+ * @param tokens the tokens being combined into one value
+ * @param delimiter the character inserted to separate each token
+ * @return the tokens separated by the delimiter
+ */
+ public static String combineTokens( String[] tokens,
+ char delimiter ) {
+ CheckArg.isNotNull(tokens, "tokens"); //$NON-NLS-1$
+ StringBuilder value = new StringBuilder();
+
+ for (String token : tokens) {
+ value.append(token).append(delimiter);
+ }
+
+ return value.toString();
+ }
+
+ /**
+ * Sizes the shell to the minimum of it's current size or the width and height display percentages.
+ *
+ * @param shell the shell being resized (if necessary) and located
+ * @param widthPercentage a number between 1 and 100 indicating a percentage of the screen size (defaults to 50 if bad value)
+ * @param heightPercentage a number between 1 and 100 indicating a percentage of the screen size (defaults to 50 if bad value)
+ */
+ public static void centerAndSizeShellRelativeToDisplay( Shell shell,
+ int widthPercentage,
+ int heightPercentage ) {
+ if ((widthPercentage < 1) || (widthPercentage > 100)) {
+ widthPercentage = 50;
+ }
+
+ if ((heightPercentage < 1) || (heightPercentage > 100)) {
+ heightPercentage = 50;
+ }
+
+ // size
+ Rectangle shellBounds = shell.getBounds();
+ Rectangle displayBounds = shell.getDisplay().getClientArea();
+ int scaledWidth = displayBounds.width * widthPercentage / 100;
+ int scaledHeight = displayBounds.height * heightPercentage / 100;
+ shell.setSize(Math.min(scaledWidth, shellBounds.width), Math.min(scaledHeight, shellBounds.height));
+ Point size = shell.getSize();
+
+ // center
+ int excessX = displayBounds.width - size.x;
+ int excessY = displayBounds.height - size.y;
+ int x = displayBounds.x + (excessX / 2);
+ int y = displayBounds.y + (excessY / 2);
+
+ shell.setLocation(x, y);
+ }
+
+ /**
+ * Converts the non-Eclipse status severity to an Eclipse severity level. An {@link Status.Severity#UNKNOWN unknown status} is
+ * converted to {@link IStatus#CANCEL cancel}.
+ *
+ * @param severity the eclipse status severity level
+ * @return the converted severity level (never <code>null</code>)
+ * @see IStatus
+ */
+ public static int convertSeverity( Severity severity ) {
+ if (severity == Severity.OK) return IStatus.OK;
+ if (severity == Severity.ERROR) return IStatus.ERROR;
+ if (severity == Severity.WARNING) return IStatus.WARNING;
+ if (severity == Severity.INFO) return IStatus.INFO;
+ return IStatus.CANCEL;
+ }
+
+ /**
+ * Converts the Eclipse status severity level to a non-Eclipse severity.
+ *
+ * @param severity the eclipse status severity level
+ * @return the converted severity level (never <code>null</code>)
+ * @see IStatus
+ */
+ public static Severity convertSeverity( int severity ) {
+ if (severity == IStatus.OK) return Severity.OK;
+ if (severity == IStatus.ERROR) return Severity.ERROR;
+ if (severity == IStatus.WARNING) return Severity.WARNING;
+ if (severity == IStatus.INFO) return Severity.INFO;
+ return Severity.UNKNOWN;
+ }
+
+ /**
+ * @param status the status being converted (never <code>null</code>)
+ * @return the Eclipse status object (never <code>null</code>)
+ */
+ public static IStatus convert( Status status ) {
+ CheckArg.isNotNull(status, "status"); //$NON-NLS-1$
+ return new org.eclipse.core.runtime.Status(convertSeverity(status.getSeverity()), PLUGIN_ID, status.getMessage(),
+ status.getException());
+ }
+
+ /**
+ * The OK status does not have an image.
+ *
+ * @param status the status whose image is being requested (never <code>null</code>)
+ * @return the image or <code>null</code> if no associated image for the status severity
+ */
+ public static Image getImage( Status status ) {
+ CheckArg.isNotNull(status, "status"); //$NON-NLS-1$
+ String imageId = null;
+
+ if (status.isError()) {
+ imageId = ISharedImages.IMG_OBJS_ERROR_TSK;
+ } else if (status.isInfo()) {
+ imageId = ISharedImages.IMG_OBJS_INFO_TSK;
+ } else if (status.isWarning()) {
+ imageId = ISharedImages.IMG_OBJS_WARN_TSK;
+ }
+
+ if (imageId != null) {
+ return Activator.getDefault().getSharedImage(imageId);
+ }
+
+ return null;
+ }
+
+ /**
+ * @param string the string whose tokens are being requested (may be <code>null</code>)
+ * @param delimiters the delimiters that separate the tokens (never <code>null</code>)
+ * @param removeDuplicates a flag indicating if duplicate tokens should be removed
+ * @return the tokens (never <code>null</code>)
+ */
+ public static String[] getTokens( String string,
+ String delimiters,
+ boolean removeDuplicates ) {
+ CheckArg.isNotNull(delimiters, "delimiters"); //$NON-NLS-1$
+
+ if (string == null) {
+ return new String[0];
+ }
+
+ Collection<String> tokens = removeDuplicates ? new TreeSet<String>() : new ArrayList<String>();
+ StringTokenizer st = new StringTokenizer(string, delimiters);
+
+ while (st.hasMoreTokens()) {
+ tokens.add(st.nextToken());
+ }
+
+ return tokens.toArray(new String[tokens.size()]);
+ }
+
+ /**
+ * The image can be used to decorate an existing image.
+ *
+ * @param status the status whose image overlay is being requested (never <code>null</code>)
+ * @return the image descriptor or <code>null</code> if none found for the status severity
+ */
+ public static ImageDescriptor getOverlayImage( Status status ) {
+ CheckArg.isNotNull(status, "status"); //$NON-NLS-1$
+ String imageId = null;
+
+ if (status.isError()) {
+ imageId = IUiConstants.ERROR_OVERLAY_IMAGE;
+ }
+
+ if (imageId != null) {
+ return Activator.getDefault().getImageDescriptor(imageId);
+ }
+
+ return null;
+ }
+
+ // ===========================================================================================================================
+ // Constructors
+ // ===========================================================================================================================
+
+ /**
+ * Don't allow construction.
+ */
+ public Utils() {
+ // nothing to do
+ }
+
+}
Property changes on: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/Utils.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/actions (from rev 1241, branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/actions)
Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/actions/BasePublishingAction.java
===================================================================
--- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/actions/BasePublishingAction.java 2009-09-22 14:51:30 UTC (rev 1241)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/actions/BasePublishingAction.java 2009-09-22 15:03:25 UTC (rev 1242)
@@ -21,9 +21,9 @@
* 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.actions;
+package org.jboss.dna.eclipse.jcr.rest.client.actions;
-import static org.jboss.dna.web.jcr.rest.client.swt.IUiConstants.DNA_IMAGE_16x;
+import static org.jboss.dna.eclipse.jcr.rest.client.IUiConstants.DNA_IMAGE_16x;
import java.util.Collections;
import java.util.List;
import org.eclipse.core.resources.IResource;
@@ -36,13 +36,13 @@
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.IObjectActionDelegate;
import org.eclipse.ui.IWorkbenchPart;
+import org.jboss.dna.eclipse.jcr.rest.client.Activator;
+import org.jboss.dna.eclipse.jcr.rest.client.RestClientI18n;
+import org.jboss.dna.eclipse.jcr.rest.client.Utils;
+import org.jboss.dna.eclipse.jcr.rest.client.jobs.PublishJob.Type;
+import org.jboss.dna.eclipse.jcr.rest.client.wizards.PublishWizard;
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.RestClientI18n;
-import org.jboss.dna.web.jcr.rest.client.swt.Utils;
-import org.jboss.dna.web.jcr.rest.client.swt.jobs.PublishJob.Type;
-import org.jboss.dna.web.jcr.rest.client.swt.wizards.PublishWizard;
/**
* The <code>BasePublishingAction</code> is a base class for all publishing actions.
Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/actions/DeleteServerAction.java
===================================================================
--- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/actions/DeleteServerAction.java 2009-09-22 14:51:30 UTC (rev 1241)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/actions/DeleteServerAction.java 2009-09-22 15:03:25 UTC (rev 1242)
@@ -21,9 +21,9 @@
* 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.actions;
+package org.jboss.dna.eclipse.jcr.rest.client.actions;
-import static org.jboss.dna.web.jcr.rest.client.swt.IUiConstants.DELETE_SERVER_IMAGE;
+import static org.jboss.dna.eclipse.jcr.rest.client.IUiConstants.DELETE_SERVER_IMAGE;
import java.util.ArrayList;
import java.util.List;
import org.eclipse.jface.dialogs.Dialog;
@@ -32,12 +32,12 @@
import org.eclipse.jface.window.Window;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.actions.BaseSelectionListenerAction;
+import org.jboss.dna.eclipse.jcr.rest.client.Activator;
+import org.jboss.dna.eclipse.jcr.rest.client.RestClientI18n;
+import org.jboss.dna.eclipse.jcr.rest.client.dialogs.DeleteServerDialog;
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.domain.Server;
-import org.jboss.dna.web.jcr.rest.client.swt.Activator;
-import org.jboss.dna.web.jcr.rest.client.swt.RestClientI18n;
-import org.jboss.dna.web.jcr.rest.client.swt.dialogs.DeleteServerDialog;
/**
* The <code>DeleteServerAction</code> deletes one or more servers from the server registry.
Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/actions/EditServerAction.java
===================================================================
--- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/actions/EditServerAction.java 2009-09-22 14:51:30 UTC (rev 1241)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/actions/EditServerAction.java 2009-09-22 15:03:25 UTC (rev 1242)
@@ -21,19 +21,19 @@
* 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.actions;
+package org.jboss.dna.eclipse.jcr.rest.client.actions;
-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;
+import static org.jboss.dna.eclipse.jcr.rest.client.IUiConstants.DNA_IMAGE_16x;
+import static org.jboss.dna.eclipse.jcr.rest.client.IUiConstants.EDIT_SERVER_IMAGE;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.wizard.WizardDialog;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.actions.BaseSelectionListenerAction;
+import org.jboss.dna.eclipse.jcr.rest.client.Activator;
+import org.jboss.dna.eclipse.jcr.rest.client.RestClientI18n;
+import org.jboss.dna.eclipse.jcr.rest.client.wizards.ServerWizard;
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.RestClientI18n;
-import org.jboss.dna.web.jcr.rest.client.swt.wizards.ServerWizard;
/**
* The <code>EditServerAction</code> runs a UI that allows {@link Server server} properties to be changed.
Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/actions/NewServerAction.java
===================================================================
--- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/actions/NewServerAction.java 2009-09-22 14:51:30 UTC (rev 1241)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/actions/NewServerAction.java 2009-09-22 15:03:25 UTC (rev 1242)
@@ -21,18 +21,18 @@
* 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.actions;
+package org.jboss.dna.eclipse.jcr.rest.client.actions;
-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;
+import static org.jboss.dna.eclipse.jcr.rest.client.IUiConstants.DNA_IMAGE_16x;
+import static org.jboss.dna.eclipse.jcr.rest.client.IUiConstants.NEW_SERVER_IMAGE;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.wizard.WizardDialog;
import org.eclipse.swt.widgets.Shell;
+import org.jboss.dna.eclipse.jcr.rest.client.Activator;
+import org.jboss.dna.eclipse.jcr.rest.client.RestClientI18n;
+import org.jboss.dna.eclipse.jcr.rest.client.wizards.ServerWizard;
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.RestClientI18n;
-import org.jboss.dna.web.jcr.rest.client.swt.wizards.ServerWizard;
/**
* The <code>NewServerAction</code> runs a UI that allows the user to create a new {@link Server server}.
Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/actions/PublishAction.java
===================================================================
--- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/actions/PublishAction.java 2009-09-22 14:51:30 UTC (rev 1241)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/actions/PublishAction.java 2009-09-22 15:03:25 UTC (rev 1242)
@@ -21,9 +21,9 @@
* 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.actions;
+package org.jboss.dna.eclipse.jcr.rest.client.actions;
-import org.jboss.dna.web.jcr.rest.client.swt.jobs.PublishJob.Type;
+import org.jboss.dna.eclipse.jcr.rest.client.jobs.PublishJob.Type;
/**
* The <code>PublishAction</code> controls the publishing of one or more {@link org.eclipse.core.resources.IResource}s to a DNA
Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/actions/ReconnectToServerAction.java
===================================================================
--- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/actions/ReconnectToServerAction.java 2009-09-22 14:51:30 UTC (rev 1241)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/actions/ReconnectToServerAction.java 2009-09-22 15:03:25 UTC (rev 1242)
@@ -21,9 +21,9 @@
* 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.actions;
+package org.jboss.dna.eclipse.jcr.rest.client.actions;
-import static org.jboss.dna.web.jcr.rest.client.swt.IUiConstants.REFRESH_IMAGE;
+import static org.jboss.dna.eclipse.jcr.rest.client.IUiConstants.REFRESH_IMAGE;
import org.eclipse.core.runtime.jobs.IJobChangeEvent;
import org.eclipse.core.runtime.jobs.JobChangeAdapter;
import org.eclipse.jface.viewers.IStructuredSelection;
@@ -31,10 +31,10 @@
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.actions.BaseSelectionListenerAction;
+import org.jboss.dna.eclipse.jcr.rest.client.Activator;
+import org.jboss.dna.eclipse.jcr.rest.client.RestClientI18n;
+import org.jboss.dna.eclipse.jcr.rest.client.jobs.ReconnectJob;
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.RestClientI18n;
-import org.jboss.dna.web.jcr.rest.client.swt.jobs.ReconnectJob;
/**
* The <code>ReconnectToServerAction</code> tries to reconnect to a selected server.
Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/actions/ShowPublishedLocationsAction.java
===================================================================
--- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/actions/ShowPublishedLocationsAction.java 2009-09-22 14:51:30 UTC (rev 1241)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/actions/ShowPublishedLocationsAction.java 2009-09-22 15:03:25 UTC (rev 1242)
@@ -21,9 +21,9 @@
* 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.actions;
+package org.jboss.dna.eclipse.jcr.rest.client.actions;
-import static org.jboss.dna.web.jcr.rest.client.swt.IUiConstants.DELETE_SERVER_IMAGE;
+import static org.jboss.dna.eclipse.jcr.rest.client.IUiConstants.DELETE_SERVER_IMAGE;
import java.util.Set;
import org.eclipse.core.resources.IFile;
import org.eclipse.jface.action.Action;
@@ -34,14 +34,14 @@
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.IObjectActionDelegate;
import org.eclipse.ui.IWorkbenchPart;
+import org.jboss.dna.eclipse.jcr.rest.client.Activator;
+import org.jboss.dna.eclipse.jcr.rest.client.DnaResourceHelper;
+import org.jboss.dna.eclipse.jcr.rest.client.RestClientI18n;
+import org.jboss.dna.eclipse.jcr.rest.client.dialogs.PublishedLocationsDialog;
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;
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.DnaResourceHelper;
-import org.jboss.dna.web.jcr.rest.client.swt.RestClientI18n;
-import org.jboss.dna.web.jcr.rest.client.swt.dialogs.PublishedLocationsDialog;
/**
* The <code>PublishAction</code> controls the publishing of one or more {@link org.eclipse.core.resources.IResource}s to a DNA
Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/actions/UnpublishAction.java
===================================================================
--- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/actions/UnpublishAction.java 2009-09-22 14:51:30 UTC (rev 1241)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/actions/UnpublishAction.java 2009-09-22 15:03:25 UTC (rev 1242)
@@ -21,9 +21,9 @@
* 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.actions;
+package org.jboss.dna.eclipse.jcr.rest.client.actions;
-import org.jboss.dna.web.jcr.rest.client.swt.jobs.PublishJob.Type;
+import org.jboss.dna.eclipse.jcr.rest.client.jobs.PublishJob.Type;
/**
* The <code>UnpublishAction</code> controls the unpublishing of one or more {@link org.eclipse.core.resources.IResource}s from a
Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/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 2009-09-22 14:51:30 UTC (rev 1241)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/actions/package-info.java 2009-09-22 15:03:25 UTC (rev 1242)
@@ -24,4 +24,4 @@
/**
* 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
+package org.jboss.dna.eclipse.jcr.rest.client.actions;
\ No newline at end of file
Copied: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/dialogs (from rev 1241, branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/dialogs)
Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/dialogs/DeleteServerDialog.java
===================================================================
--- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/dialogs/DeleteServerDialog.java 2009-09-22 14:51:30 UTC (rev 1241)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/dialogs/DeleteServerDialog.java 2009-09-22 15:03:25 UTC (rev 1242)
@@ -21,9 +21,9 @@
* 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.dialogs;
+package org.jboss.dna.eclipse.jcr.rest.client.dialogs;
-import static org.jboss.dna.web.jcr.rest.client.swt.IUiConstants.DNA_IMAGE_16x;
+import static org.jboss.dna.eclipse.jcr.rest.client.IUiConstants.DNA_IMAGE_16x;
import java.util.Collection;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.MessageDialog;
@@ -35,11 +35,11 @@
import org.eclipse.swt.widgets.List;
import org.eclipse.swt.widgets.Shell;
import org.jboss.dna.common.util.CheckArg;
+import org.jboss.dna.eclipse.jcr.rest.client.Activator;
+import org.jboss.dna.eclipse.jcr.rest.client.RestClientI18n;
+import org.jboss.dna.eclipse.jcr.rest.client.Utils;
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.RestClientI18n;
-import org.jboss.dna.web.jcr.rest.client.swt.Utils;
/**
* The <code>DeleteServerDialog</code> class provides a UI for deleting a {@link Server server}.
Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/dialogs/PublishedLocationsDialog.java
===================================================================
--- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/dialogs/PublishedLocationsDialog.java 2009-09-22 14:51:30 UTC (rev 1241)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/dialogs/PublishedLocationsDialog.java 2009-09-22 15:03:25 UTC (rev 1242)
@@ -21,13 +21,13 @@
* 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.dialogs;
+package org.jboss.dna.eclipse.jcr.rest.client.dialogs;
-import static org.jboss.dna.web.jcr.rest.client.swt.IUiConstants.BLANK_IMAGE;
-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.REPOSITORY_IMAGE;
-import static org.jboss.dna.web.jcr.rest.client.swt.IUiConstants.SERVER_IMAGE;
-import static org.jboss.dna.web.jcr.rest.client.swt.IUiConstants.WORKSPACE_IMAGE;
+import static org.jboss.dna.eclipse.jcr.rest.client.IUiConstants.BLANK_IMAGE;
+import static org.jboss.dna.eclipse.jcr.rest.client.IUiConstants.DNA_IMAGE_16x;
+import static org.jboss.dna.eclipse.jcr.rest.client.IUiConstants.REPOSITORY_IMAGE;
+import static org.jboss.dna.eclipse.jcr.rest.client.IUiConstants.SERVER_IMAGE;
+import static org.jboss.dna.eclipse.jcr.rest.client.IUiConstants.WORKSPACE_IMAGE;
import java.io.File;
import java.util.Collection;
import org.eclipse.core.resources.IFile;
@@ -59,14 +59,14 @@
import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.TableColumn;
import org.jboss.dna.common.util.CheckArg;
+import org.jboss.dna.eclipse.jcr.rest.client.Activator;
+import org.jboss.dna.eclipse.jcr.rest.client.RestClientI18n;
+import org.jboss.dna.eclipse.jcr.rest.client.Utils;
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;
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.RestClientI18n;
-import org.jboss.dna.web.jcr.rest.client.swt.Utils;
/**
* The <code>PublishedLocationsDialog</code> class provides a UI for viewing a list of {@link Server servers} a selected file has
Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/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 2009-09-22 14:51:30 UTC (rev 1241)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/dialogs/package-info.java 2009-09-22 15:03:25 UTC (rev 1242)
@@ -25,4 +25,4 @@
* 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
+package org.jboss.dna.eclipse.jcr.rest.client.dialogs;
\ No newline at end of file
Copied: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/jobs (from rev 1241, branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/jobs)
Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/jobs/PublishJob.java
===================================================================
--- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/jobs/PublishJob.java 2009-09-22 14:51:30 UTC (rev 1241)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/jobs/PublishJob.java 2009-09-22 15:03:25 UTC (rev 1242)
@@ -21,10 +21,10 @@
* 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.jobs;
+package org.jboss.dna.eclipse.jcr.rest.client.jobs;
-import static org.jboss.dna.web.jcr.rest.client.swt.IUiConstants.DNA_PUBLISHING_JOB_FAMILY;
-import static org.jboss.dna.web.jcr.rest.client.swt.IUiConstants.PLUGIN_ID;
+import static org.jboss.dna.eclipse.jcr.rest.client.IUiConstants.DNA_PUBLISHING_JOB_FAMILY;
+import static org.jboss.dna.eclipse.jcr.rest.client.IUiConstants.PLUGIN_ID;
import java.io.File;
import java.net.URL;
import java.util.List;
@@ -34,14 +34,14 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.jobs.Job;
import org.jboss.dna.common.util.CheckArg;
+import org.jboss.dna.eclipse.jcr.rest.client.Activator;
+import org.jboss.dna.eclipse.jcr.rest.client.DnaResourceHelper;
+import org.jboss.dna.eclipse.jcr.rest.client.RestClientI18n;
+import org.jboss.dna.eclipse.jcr.rest.client.views.DnaContentProvider;
+import org.jboss.dna.eclipse.jcr.rest.client.views.DnaMessageConsole;
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.domain.Workspace;
-import org.jboss.dna.web.jcr.rest.client.swt.Activator;
-import org.jboss.dna.web.jcr.rest.client.swt.DnaResourceHelper;
-import org.jboss.dna.web.jcr.rest.client.swt.RestClientI18n;
-import org.jboss.dna.web.jcr.rest.client.swt.views.DnaContentProvider;
-import org.jboss.dna.web.jcr.rest.client.swt.views.DnaMessageConsole;
/**
* The <code>PublishJob</code> publishes or unpublishes one or more files using the {@link ServerManager}.
Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/jobs/ReconnectJob.java
===================================================================
--- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/jobs/ReconnectJob.java 2009-09-22 14:51:30 UTC (rev 1241)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/jobs/ReconnectJob.java 2009-09-22 15:03:25 UTC (rev 1242)
@@ -21,20 +21,20 @@
* 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.jobs;
+package org.jboss.dna.eclipse.jcr.rest.client.jobs;
-import static org.jboss.dna.web.jcr.rest.client.swt.IUiConstants.DNA_PUBLISHING_JOB_FAMILY;
-import static org.jboss.dna.web.jcr.rest.client.swt.IUiConstants.PLUGIN_ID;
-import static org.jboss.dna.web.jcr.rest.client.swt.RestClientI18n.reconnectJobTaskName;
+import static org.jboss.dna.eclipse.jcr.rest.client.IUiConstants.DNA_PUBLISHING_JOB_FAMILY;
+import static org.jboss.dna.eclipse.jcr.rest.client.IUiConstants.PLUGIN_ID;
+import static org.jboss.dna.eclipse.jcr.rest.client.RestClientI18n.reconnectJobTaskName;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.jobs.Job;
+import org.jboss.dna.eclipse.jcr.rest.client.Activator;
+import org.jboss.dna.eclipse.jcr.rest.client.RestClientI18n;
+import org.jboss.dna.eclipse.jcr.rest.client.Utils;
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.domain.Server;
-import org.jboss.dna.web.jcr.rest.client.swt.Activator;
-import org.jboss.dna.web.jcr.rest.client.swt.RestClientI18n;
-import org.jboss.dna.web.jcr.rest.client.swt.Utils;
/**
* The <code>ReconnectJob</code> attempts to reconnect to the selected {@link Server server(s)}.
Copied: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/log (from rev 1241, branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/log)
Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/log/EclipseLogger.java
===================================================================
--- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/log/EclipseLogger.java 2009-09-22 14:51:30 UTC (rev 1241)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/log/EclipseLogger.java 2009-09-22 15:03:25 UTC (rev 1242)
@@ -21,14 +21,14 @@
* 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;
+package org.jboss.dna.eclipse.jcr.rest.client.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.jboss.dna.eclipse.jcr.rest.client.IUiConstants;
import org.slf4j.Logger;
import org.slf4j.Marker;
Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/log/EclipseLoggerFactory.java
===================================================================
--- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/log/EclipseLoggerFactory.java 2009-09-22 14:51:30 UTC (rev 1241)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/log/EclipseLoggerFactory.java 2009-09-22 15:03:25 UTC (rev 1242)
@@ -21,7 +21,7 @@
* 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;
+package org.jboss.dna.eclipse.jcr.rest.client.log;
import java.util.HashMap;
import java.util.Map;
Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/log/StaticLoggerBinder.java
===================================================================
--- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/log/StaticLoggerBinder.java 2009-09-22 14:51:30 UTC (rev 1241)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/log/StaticLoggerBinder.java 2009-09-22 15:03:25 UTC (rev 1242)
@@ -21,7 +21,7 @@
* 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;
+package org.jboss.dna.eclipse.jcr.rest.client.log;
import org.slf4j.ILoggerFactory;
import org.slf4j.spi.LoggerFactoryBinder;
Copied: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/package-info.java (from rev 1241, 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/eclipse/jcr/rest/client/package-info.java (rev 0)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/package-info.java 2009-09-22 15:03:25 UTC (rev 1242)
@@ -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.eclipse.jcr.rest.client;
\ No newline at end of file
Property changes on: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/package-info.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/preferences (from rev 1241, branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/preferences)
Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/preferences/DnaPreferencePage.java
===================================================================
--- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/preferences/DnaPreferencePage.java 2009-09-22 14:51:30 UTC (rev 1241)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/preferences/DnaPreferencePage.java 2009-09-22 15:03:25 UTC (rev 1242)
@@ -21,13 +21,13 @@
* 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.preferences;
+package org.jboss.dna.eclipse.jcr.rest.client.preferences;
-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.PREFERENCE_PAGE_HELP_CONTEXT;
-import static org.jboss.dna.web.jcr.rest.client.swt.RestClientI18n.dnaPreferencePageDescription;
-import static org.jboss.dna.web.jcr.rest.client.swt.RestClientI18n.dnaPreferencePageMessage;
-import static org.jboss.dna.web.jcr.rest.client.swt.RestClientI18n.dnaPreferencePageTitle;
+import static org.jboss.dna.eclipse.jcr.rest.client.IUiConstants.DNA_IMAGE_16x;
+import static org.jboss.dna.eclipse.jcr.rest.client.IUiConstants.PREFERENCE_PAGE_HELP_CONTEXT;
+import static org.jboss.dna.eclipse.jcr.rest.client.RestClientI18n.dnaPreferencePageDescription;
+import static org.jboss.dna.eclipse.jcr.rest.client.RestClientI18n.dnaPreferencePageMessage;
+import static org.jboss.dna.eclipse.jcr.rest.client.RestClientI18n.dnaPreferencePageTitle;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferencePage;
import org.eclipse.swt.SWT;
@@ -39,7 +39,7 @@
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchPreferencePage;
import org.eclipse.ui.help.IWorkbenchHelpSystem;
-import org.jboss.dna.web.jcr.rest.client.swt.Activator;
+import org.jboss.dna.eclipse.jcr.rest.client.Activator;
/**
* The <code>DnaPreferencePage</code> is the UI for managing all DNA-related preferences.
Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/preferences/FilteredFileExtensionEditor.java
===================================================================
--- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/preferences/FilteredFileExtensionEditor.java 2009-09-22 14:51:30 UTC (rev 1241)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/preferences/FilteredFileExtensionEditor.java 2009-09-22 15:03:25 UTC (rev 1242)
@@ -1,11 +1,11 @@
-package org.jboss.dna.web.jcr.rest.client.swt.preferences;
+package org.jboss.dna.eclipse.jcr.rest.client.preferences;
-import static org.jboss.dna.web.jcr.rest.client.swt.IUiConstants.FILTERED_FILE_EXTENSIONS_PREFERENCE;
-import static org.jboss.dna.web.jcr.rest.client.swt.RestClientI18n.dnaPreferencePageFilteredFileExtensionsLabel;
-import static org.jboss.dna.web.jcr.rest.client.swt.RestClientI18n.newFilteredFileExtensionDialogLabel;
-import static org.jboss.dna.web.jcr.rest.client.swt.RestClientI18n.newFilteredFileExtensionDialogTitle;
-import static org.jboss.dna.web.jcr.rest.client.swt.preferences.PrefUtils.FILE_EXT_DELIMITER;
-import static org.jboss.dna.web.jcr.rest.client.swt.preferences.PrefUtils.FILE_EXT_INVALID_CHARS;
+import static org.jboss.dna.eclipse.jcr.rest.client.IUiConstants.FILTERED_FILE_EXTENSIONS_PREFERENCE;
+import static org.jboss.dna.eclipse.jcr.rest.client.RestClientI18n.dnaPreferencePageFilteredFileExtensionsLabel;
+import static org.jboss.dna.eclipse.jcr.rest.client.RestClientI18n.newFilteredFileExtensionDialogLabel;
+import static org.jboss.dna.eclipse.jcr.rest.client.RestClientI18n.newFilteredFileExtensionDialogTitle;
+import static org.jboss.dna.eclipse.jcr.rest.client.preferences.PrefUtils.FILE_EXT_DELIMITER;
+import static org.jboss.dna.eclipse.jcr.rest.client.preferences.PrefUtils.FILE_EXT_INVALID_CHARS;
import java.util.Arrays;
import java.util.Set;
import java.util.TreeSet;
@@ -14,7 +14,7 @@
import org.eclipse.swt.events.VerifyEvent;
import org.eclipse.swt.events.VerifyListener;
import org.eclipse.swt.widgets.Composite;
-import org.jboss.dna.web.jcr.rest.client.swt.Utils;
+import org.jboss.dna.eclipse.jcr.rest.client.Utils;
/**
* The <code>FilteredFileExtensionEditor</code> is an editor for managing a set of filtered file extensions.
Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/preferences/FilteredFoldersEditor.java
===================================================================
--- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/preferences/FilteredFoldersEditor.java 2009-09-22 14:51:30 UTC (rev 1241)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/preferences/FilteredFoldersEditor.java 2009-09-22 15:03:25 UTC (rev 1242)
@@ -1,11 +1,11 @@
-package org.jboss.dna.web.jcr.rest.client.swt.preferences;
+package org.jboss.dna.eclipse.jcr.rest.client.preferences;
-import static org.jboss.dna.web.jcr.rest.client.swt.IUiConstants.FILTERED_FOLDER_NAMES_PREFERENCE;
-import static org.jboss.dna.web.jcr.rest.client.swt.RestClientI18n.dnaPreferencePageFilteredFolderNamesLabel;
-import static org.jboss.dna.web.jcr.rest.client.swt.RestClientI18n.newFilteredFolderNameDialogLabel;
-import static org.jboss.dna.web.jcr.rest.client.swt.RestClientI18n.newFilteredFolderNameDialogTitle;
-import static org.jboss.dna.web.jcr.rest.client.swt.preferences.PrefUtils.FOLDER_NAME_DELIMITER;
-import static org.jboss.dna.web.jcr.rest.client.swt.preferences.PrefUtils.FOLDER_NAME_INVALID_CHARS;
+import static org.jboss.dna.eclipse.jcr.rest.client.IUiConstants.FILTERED_FOLDER_NAMES_PREFERENCE;
+import static org.jboss.dna.eclipse.jcr.rest.client.RestClientI18n.dnaPreferencePageFilteredFolderNamesLabel;
+import static org.jboss.dna.eclipse.jcr.rest.client.RestClientI18n.newFilteredFolderNameDialogLabel;
+import static org.jboss.dna.eclipse.jcr.rest.client.RestClientI18n.newFilteredFolderNameDialogTitle;
+import static org.jboss.dna.eclipse.jcr.rest.client.preferences.PrefUtils.FOLDER_NAME_DELIMITER;
+import static org.jboss.dna.eclipse.jcr.rest.client.preferences.PrefUtils.FOLDER_NAME_INVALID_CHARS;
import java.util.Arrays;
import java.util.Set;
import java.util.TreeSet;
@@ -14,7 +14,7 @@
import org.eclipse.swt.events.VerifyEvent;
import org.eclipse.swt.events.VerifyListener;
import org.eclipse.swt.widgets.Composite;
-import org.jboss.dna.web.jcr.rest.client.swt.Utils;
+import org.jboss.dna.eclipse.jcr.rest.client.Utils;
/**
* The <code>FilteredFoldersEditor</code> is an editor for managing a set of folder names.
Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/preferences/NewItemDialog.java
===================================================================
--- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/preferences/NewItemDialog.java 2009-09-22 14:51:30 UTC (rev 1241)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/preferences/NewItemDialog.java 2009-09-22 15:03:25 UTC (rev 1242)
@@ -1,4 +1,4 @@
-package org.jboss.dna.web.jcr.rest.client.swt.preferences;
+package org.jboss.dna.eclipse.jcr.rest.client.preferences;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.swt.SWT;
Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/preferences/PrefUtils.java
===================================================================
--- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/preferences/PrefUtils.java 2009-09-22 14:51:30 UTC (rev 1241)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/preferences/PrefUtils.java 2009-09-22 15:03:25 UTC (rev 1242)
@@ -21,20 +21,20 @@
* 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.preferences;
+package org.jboss.dna.eclipse.jcr.rest.client.preferences;
-import static org.jboss.dna.web.jcr.rest.client.swt.IUiConstants.FILTERED_FILE_EXTENSIONS_PREFERENCE;
-import static org.jboss.dna.web.jcr.rest.client.swt.IUiConstants.FILTERED_FOLDER_NAMES_PREFERENCE;
-import static org.jboss.dna.web.jcr.rest.client.swt.RestClientI18n.prefUtilsPropertyFileNotFound;
-import static org.jboss.dna.web.jcr.rest.client.swt.RestClientI18n.prefUtilsPropertyNotFound;
+import static org.jboss.dna.eclipse.jcr.rest.client.IUiConstants.FILTERED_FILE_EXTENSIONS_PREFERENCE;
+import static org.jboss.dna.eclipse.jcr.rest.client.IUiConstants.FILTERED_FOLDER_NAMES_PREFERENCE;
+import static org.jboss.dna.eclipse.jcr.rest.client.RestClientI18n.prefUtilsPropertyFileNotFound;
+import static org.jboss.dna.eclipse.jcr.rest.client.RestClientI18n.prefUtilsPropertyNotFound;
import java.io.InputStream;
import java.util.Properties;
import org.eclipse.jface.preference.IPreferenceStore;
import org.jboss.dna.common.util.CheckArg;
+import org.jboss.dna.eclipse.jcr.rest.client.Activator;
+import org.jboss.dna.eclipse.jcr.rest.client.Utils;
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.Utils;
/**
* The <code>PrefUtils</code> class provides common utilities relating to preferences. This class assumes the Eclipse runtime
Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/preferences/PublishingFileFilter.java
===================================================================
--- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/preferences/PublishingFileFilter.java 2009-09-22 14:51:30 UTC (rev 1241)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/preferences/PublishingFileFilter.java 2009-09-22 15:03:25 UTC (rev 1242)
@@ -21,7 +21,7 @@
* 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.preferences;
+package org.jboss.dna.eclipse.jcr.rest.client.preferences;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IFolder;
Copied: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/views (from rev 1241, branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/views)
Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/views/DnaContentProvider.java
===================================================================
--- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/views/DnaContentProvider.java 2009-09-22 14:51:30 UTC (rev 1241)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/views/DnaContentProvider.java 2009-09-22 15:03:25 UTC (rev 1242)
@@ -21,9 +21,9 @@
* 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.views;
+package org.jboss.dna.eclipse.jcr.rest.client.views;
-import static org.jboss.dna.web.jcr.rest.client.swt.IUiConstants.PUBLISHED_OVERLAY_IMAGE;
+import static org.jboss.dna.eclipse.jcr.rest.client.IUiConstants.PUBLISHED_OVERLAY_IMAGE;
import org.eclipse.core.resources.IFile;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.ColumnLabelProvider;
@@ -36,6 +36,10 @@
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.IDecoratorManager;
+import org.jboss.dna.eclipse.jcr.rest.client.Activator;
+import org.jboss.dna.eclipse.jcr.rest.client.DnaResourceHelper;
+import org.jboss.dna.eclipse.jcr.rest.client.RestClientI18n;
+import org.jboss.dna.eclipse.jcr.rest.client.Utils;
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,10 +47,6 @@
import org.jboss.dna.web.jcr.rest.client.domain.Repository;
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.DnaResourceHelper;
-import org.jboss.dna.web.jcr.rest.client.swt.RestClientI18n;
-import org.jboss.dna.web.jcr.rest.client.swt.Utils;
/**
* The <code>DnaContentProvider</code> is a content and label provider for DNA repositories.
@@ -60,7 +60,7 @@
/**
* The decorator ID.
*/
- private static final String ID = "org.jboss.dna.web.jcr.rest.client.swt.dnaDecorator"; //$NON-NLS-1$
+ private static final String ID = "org.jboss.dna.eclipse.jcr.rest.client.dnaDecorator"; //$NON-NLS-1$
// ===========================================================================================================================
// Class Methods
Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/views/DnaMessageConsole.java
===================================================================
--- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/views/DnaMessageConsole.java 2009-09-22 14:51:30 UTC (rev 1241)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/views/DnaMessageConsole.java 2009-09-22 15:03:25 UTC (rev 1242)
@@ -21,9 +21,9 @@
* 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.views;
+package org.jboss.dna.eclipse.jcr.rest.client.views;
-import static org.jboss.dna.web.jcr.rest.client.swt.IUiConstants.DNA_IMAGE_16x;
+import static org.jboss.dna.eclipse.jcr.rest.client.IUiConstants.DNA_IMAGE_16x;
import org.eclipse.core.resources.IFile;
import org.eclipse.debug.ui.console.FileLink;
import org.eclipse.jface.text.BadLocationException;
@@ -41,10 +41,10 @@
import org.eclipse.ui.console.MessageConsole;
import org.eclipse.ui.console.MessageConsoleStream;
import org.jboss.dna.common.util.CheckArg;
+import org.jboss.dna.eclipse.jcr.rest.client.Activator;
+import org.jboss.dna.eclipse.jcr.rest.client.RestClientI18n;
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.RestClientI18n;
/**
* The <code>DnaMessageConsole</code> is a message console view where status of publishing operations are logged. This class
@@ -69,7 +69,7 @@
/**
* The identifier and type of the DNA Message Console.
*/
- private static final String ID = "org.jboss.dna.web.jcr.rest.client.swt.views.DnaMessageConsole"; //$NON-NLS-1$
+ private static final String ID = "org.jboss.dna.eclipse.jcr.rest.client.views.DnaMessageConsole"; //$NON-NLS-1$
/**
* The message console name.
Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/views/ServerView.java
===================================================================
--- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/views/ServerView.java 2009-09-22 14:51:30 UTC (rev 1241)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/views/ServerView.java 2009-09-22 15:03:25 UTC (rev 1242)
@@ -21,10 +21,10 @@
* 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.views;
+package org.jboss.dna.eclipse.jcr.rest.client.views;
-import static org.jboss.dna.web.jcr.rest.client.swt.IUiConstants.COLLAPSE_ALL_IMAGE;
-import static org.jboss.dna.web.jcr.rest.client.swt.IUiConstants.SERVER_VIEW_HELP_CONTEXT;
+import static org.jboss.dna.eclipse.jcr.rest.client.IUiConstants.COLLAPSE_ALL_IMAGE;
+import static org.jboss.dna.eclipse.jcr.rest.client.IUiConstants.SERVER_VIEW_HELP_CONTEXT;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.action.IToolBarManager;
@@ -45,16 +45,16 @@
import org.eclipse.ui.actions.BaseSelectionListenerAction;
import org.eclipse.ui.help.IWorkbenchHelpSystem;
import org.eclipse.ui.part.ViewPart;
+import org.jboss.dna.eclipse.jcr.rest.client.Activator;
+import org.jboss.dna.eclipse.jcr.rest.client.RestClientI18n;
+import org.jboss.dna.eclipse.jcr.rest.client.actions.DeleteServerAction;
+import org.jboss.dna.eclipse.jcr.rest.client.actions.EditServerAction;
+import org.jboss.dna.eclipse.jcr.rest.client.actions.NewServerAction;
+import org.jboss.dna.eclipse.jcr.rest.client.actions.ReconnectToServerAction;
import org.jboss.dna.web.jcr.rest.client.IServerRegistryListener;
import org.jboss.dna.web.jcr.rest.client.ServerManager;
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.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;
-import org.jboss.dna.web.jcr.rest.client.swt.actions.ReconnectToServerAction;
/**
* The <code>ServerView</code> shows all defined servers and their DNA repositories.
Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/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 2009-09-22 14:51:30 UTC (rev 1241)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/views/package-info.java 2009-09-22 15:03:25 UTC (rev 1242)
@@ -25,4 +25,4 @@
* 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
+package org.jboss.dna.eclipse.jcr.rest.client.views;
\ No newline at end of file
Copied: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/wizards (from rev 1241, branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/wizards)
Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/wizards/PublishPage.java
===================================================================
--- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/wizards/PublishPage.java 2009-09-22 14:51:30 UTC (rev 1241)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/wizards/PublishPage.java 2009-09-22 15:03:25 UTC (rev 1242)
@@ -21,9 +21,9 @@
* 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.wizards;
+package org.jboss.dna.eclipse.jcr.rest.client.wizards;
-import static org.jboss.dna.web.jcr.rest.client.swt.IUiConstants.PUBLISH_DIALOG_HELP_CONTEXT;
+import static org.jboss.dna.eclipse.jcr.rest.client.IUiConstants.PUBLISH_DIALOG_HELP_CONTEXT;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -54,6 +54,11 @@
import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Label;
import org.eclipse.ui.help.IWorkbenchHelpSystem;
+import org.jboss.dna.eclipse.jcr.rest.client.Activator;
+import org.jboss.dna.eclipse.jcr.rest.client.RestClientI18n;
+import org.jboss.dna.eclipse.jcr.rest.client.actions.NewServerAction;
+import org.jboss.dna.eclipse.jcr.rest.client.jobs.PublishJob.Type;
+import org.jboss.dna.eclipse.jcr.rest.client.preferences.PublishingFileFilter;
import org.jboss.dna.web.jcr.rest.client.IServerRegistryListener;
import org.jboss.dna.web.jcr.rest.client.ServerManager;
import org.jboss.dna.web.jcr.rest.client.ServerRegistryEvent;
@@ -62,11 +67,6 @@
import org.jboss.dna.web.jcr.rest.client.domain.Repository;
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.RestClientI18n;
-import org.jboss.dna.web.jcr.rest.client.swt.actions.NewServerAction;
-import org.jboss.dna.web.jcr.rest.client.swt.jobs.PublishJob.Type;
-import org.jboss.dna.web.jcr.rest.client.swt.preferences.PublishingFileFilter;
/**
* The <code>PublishPage</code> is a UI for publishing or unpublishing one or more files to a DNA repository.
Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/wizards/PublishWizard.java
===================================================================
--- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/wizards/PublishWizard.java 2009-09-22 14:51:30 UTC (rev 1241)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/wizards/PublishWizard.java 2009-09-22 15:03:25 UTC (rev 1242)
@@ -21,9 +21,9 @@
* 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.wizards;
+package org.jboss.dna.eclipse.jcr.rest.client.wizards;
-import static org.jboss.dna.web.jcr.rest.client.swt.IUiConstants.DNA_WIZARD_BANNER_IMAGE;
+import static org.jboss.dna.eclipse.jcr.rest.client.IUiConstants.DNA_WIZARD_BANNER_IMAGE;
import java.util.List;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IResource;
@@ -31,12 +31,12 @@
import org.eclipse.jface.dialogs.IDialogSettings;
import org.eclipse.jface.wizard.Wizard;
import org.jboss.dna.common.util.CheckArg;
+import org.jboss.dna.eclipse.jcr.rest.client.Activator;
+import org.jboss.dna.eclipse.jcr.rest.client.RestClientI18n;
+import org.jboss.dna.eclipse.jcr.rest.client.jobs.PublishJob;
+import org.jboss.dna.eclipse.jcr.rest.client.jobs.PublishJob.Type;
import org.jboss.dna.web.jcr.rest.client.ServerManager;
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.RestClientI18n;
-import org.jboss.dna.web.jcr.rest.client.swt.jobs.PublishJob;
-import org.jboss.dna.web.jcr.rest.client.swt.jobs.PublishJob.Type;
/**
* The <code>PublishWizard</code> is the wizard that published and unpublishes resources.
Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/wizards/ServerPage.java
===================================================================
--- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/wizards/ServerPage.java 2009-09-22 14:51:30 UTC (rev 1241)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/wizards/ServerPage.java 2009-09-22 15:03:25 UTC (rev 1242)
@@ -21,9 +21,9 @@
* 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.wizards;
+package org.jboss.dna.eclipse.jcr.rest.client.wizards;
-import static org.jboss.dna.web.jcr.rest.client.swt.IUiConstants.SERVER_DIALOG_HELP_CONTEXT;
+import static org.jboss.dna.eclipse.jcr.rest.client.IUiConstants.SERVER_DIALOG_HELP_CONTEXT;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.IMessageProvider;
import org.eclipse.jface.dialogs.MessageDialog;
@@ -45,12 +45,12 @@
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.help.IWorkbenchHelpSystem;
+import org.jboss.dna.eclipse.jcr.rest.client.Activator;
+import org.jboss.dna.eclipse.jcr.rest.client.RestClientI18n;
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.domain.Server;
import org.jboss.dna.web.jcr.rest.client.domain.validation.ServerValidator;
-import org.jboss.dna.web.jcr.rest.client.swt.Activator;
-import org.jboss.dna.web.jcr.rest.client.swt.RestClientI18n;
/**
* The <code>ServerPage</code> is used to create or modify a server.
Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/wizards/ServerWizard.java
===================================================================
--- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/wizards/ServerWizard.java 2009-09-22 14:51:30 UTC (rev 1241)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/wizards/ServerWizard.java 2009-09-22 15:03:25 UTC (rev 1242)
@@ -21,16 +21,16 @@
* 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.wizards;
+package org.jboss.dna.eclipse.jcr.rest.client.wizards;
-import static org.jboss.dna.web.jcr.rest.client.swt.IUiConstants.DNA_WIZARD_BANNER_IMAGE;
+import static org.jboss.dna.eclipse.jcr.rest.client.IUiConstants.DNA_WIZARD_BANNER_IMAGE;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.wizard.Wizard;
+import org.jboss.dna.eclipse.jcr.rest.client.Activator;
+import org.jboss.dna.eclipse.jcr.rest.client.RestClientI18n;
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.domain.Server;
-import org.jboss.dna.web.jcr.rest.client.swt.Activator;
-import org.jboss.dna.web.jcr.rest.client.swt.RestClientI18n;
/**
* The <code>ServerWizard</code> is the wizard used to create and edit servers.
Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/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 2009-09-22 14:51:30 UTC (rev 1241)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/eclipse/jcr/rest/client/wizards/package-info.java 2009-09-22 15:03:25 UTC (rev 1242)
@@ -25,4 +25,4 @@
* 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
+package org.jboss.dna.eclipse.jcr.rest.client.wizards;
\ No newline at end of file
Deleted: 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-09-22 14:51:30 UTC (rev 1241)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/Activator.java 2009-09-22 15:03:25 UTC (rev 1242)
@@ -1,279 +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 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;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-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;
-import org.jboss.dna.web.jcr.rest.client.domain.IDnaObject;
-import org.jboss.dna.web.jcr.rest.client.domain.Repository;
-import org.jboss.dna.web.jcr.rest.client.domain.Server;
-import org.jboss.dna.web.jcr.rest.client.domain.Workspace;
-import org.osgi.framework.BundleContext;
-
-/**
- * The <code>Activator</code> controls the plug-in life cycle, provides utility functions, and keeps track of the
- * {@link ServerManager}.
- */
-public final class Activator extends AbstractUIPlugin implements IUiConstants {
-
- // ===========================================================================================================================
- // Class Fields
- // ===========================================================================================================================
-
- /**
- * The shared plugin instance.
- */
- private static Activator plugin;
-
- // ===========================================================================================================================
- // Class Methods
- // ===========================================================================================================================
-
- /**
- * @return the shared instance or <code>null</code> if not constructed
- */
- public static Activator getDefault() {
- return plugin;
- }
-
- // ===========================================================================================================================
- // Fields
- // ===========================================================================================================================
-
- /**
- * The image used when the requested image cannot be found.
- */
- private Image missingImage;
-
- /**
- * The manager in charge of the server registry.
- */
- private ServerManager serverMgr;
-
- // ===========================================================================================================================
- // 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
- */
- 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, RestClientI18n.missingImage.text(key), e));
- return null;
- }
- }
-
- /**
- * @return the image to use when a requested image cannot be found
- */
- private Image getMissingImage() {
- if (this.missingImage == null) {
- this.missingImage = ImageDescriptor.getMissingImageDescriptor().createImage();
- }
-
- return this.missingImage;
- }
-
- /**
- * @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
- */
- 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 (never <code>null</code>)
- * @return the image descriptor or a descriptor indicating the requested descriptor could not be found
- * @see ISharedImages
- */
- public ImageDescriptor getSharedImageDescriptor( String imageId ) {
- CheckArg.isNotNull(imageId, "imageId"); //$NON-NLS-1$
- ImageDescriptor result = PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(imageId);
-
- if (result != null) {
- return result;
- }
-
- return ImageDescriptor.getMissingImageDescriptor();
- }
-
- /**
- * @param object the object whose image is being requested (domain object or plugin-relative path)
- * @return the image or <code>null</code> if not found
- */
- public Image getImage( Object object ) {
- String key = null;
-
- if (object instanceof Workspace) {
- key = WORKSPACE_IMAGE;
- } else if (object instanceof Repository) {
- key = REPOSITORY_IMAGE;
- } else if (object instanceof Server) {
- key = SERVER_IMAGE;
- } else if (object instanceof IDnaObject) {
- // should have an icon for every business object
- assert false;
- } else if (object instanceof String) {
- key = (String)object;
- }
-
- if (key != null) {
- ImageRegistry registry = getImageRegistry();
- Image image = registry.get(key);
-
- if (image == null) {
- ImageDescriptor descriptor = createImageDescriptor(key);
-
- if (descriptor == null) {
- return getMissingImage();
- }
-
- image = descriptor.createImage();
- registry.put(key, image);
- }
-
- return image;
- }
-
- return null;
- }
-
- /**
- * @param object the object whose image descriptor is being requested
- * @return the image descriptor or <code>null</code> if not found
- */
- public ImageDescriptor getImageDescriptor( Object object ) {
- String key = null;
-
- if (object instanceof Workspace) {
- key = WORKSPACE_IMAGE;
- } else if (object instanceof Repository) {
- key = REPOSITORY_IMAGE;
- } else if (object instanceof Server) {
- key = SERVER_IMAGE;
- } else if (object instanceof IDnaObject) {
- // should have an icon for every business object
- assert false;
- } else if (object instanceof String) {
- key = (String)object;
- }
-
- if (key != null) {
- ImageDescriptor descriptor = AbstractUIPlugin.imageDescriptorFromPlugin(PLUGIN_ID, ((String)object));
- return ((descriptor == null) ? ImageDescriptor.getMissingImageDescriptor() : descriptor);
- }
-
- return null;
- }
-
- /**
- * @return the server manager or <code>null</code> if activator has not been initialized or started
- * @see #start(BundleContext)
- */
- public ServerManager getServerManager() {
- return this.serverMgr;
- }
-
- /**
- * @param status the status being logged (never <code>null</code>)
- */
- 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());
- getLog().log(eclipseStatus);
- }
-
- /**
- * {@inheritDoc}
- *
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
- @Override
- public void start( BundleContext context ) throws Exception {
- BasicConfigurator.configure();
-
- super.start(context);
- plugin = this;
-
- this.serverMgr = new ServerManager(getStateLocation().toFile().getAbsolutePath());
- Status status = this.serverMgr.restoreState();
-
- // problem restoring server registry
- if (!status.isOk()) {
- log(status);
- }
- }
-
- /**
- * {@inheritDoc}
- *
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
- @Override
- public void stop( BundleContext context ) throws Exception {
- if (missingImage != null) {
- missingImage.dispose();
- }
-
- if (this.serverMgr != null) {
- Status status = this.serverMgr.saveState();
-
- if (!status.isOk()) {
- log(status);
- }
-
- this.serverMgr = null;
- }
-
- super.stop(context);
-
- plugin = null;
- }
-
-}
Deleted: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/DnaResourceHelper.java
===================================================================
--- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/DnaResourceHelper.java 2009-09-22 14:51:30 UTC (rev 1241)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/DnaResourceHelper.java 2009-09-22 15:03:25 UTC (rev 1242)
@@ -1,246 +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 java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.StringTokenizer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.QualifiedName;
-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;
-import org.jboss.dna.web.jcr.rest.client.domain.Repository;
-import org.jboss.dna.web.jcr.rest.client.domain.Server;
-import org.jboss.dna.web.jcr.rest.client.domain.Workspace;
-
-/**
- * The <code>DnaResourceHelper</code> knows how to get and set the property on a resource that indicates it has been published to
- * one or more workspaces.
- */
-public final class DnaResourceHelper {
-
- // ===========================================================================================================================
- // Constants
- // ===========================================================================================================================
-
- /**
- * Delimiter between a workspace's properties.
- */
- private static final String ID_DELIM = "$"; //$NON-NLS-1$
-
- /**
- * Delimiter between workspaces.
- */
- private static final String DELIM = "|"; //$NON-NLS-1$
-
- /**
- * The name of the persisted file property indicating if the resource has been published. This property will only exist if the
- * file has been published to at least one DNA repository. The value of the property is a list of DNA repository workspaces
- * where this file has been published.
- */
- private static QualifiedName PUBLISHED_RESOURCE_PROPERTY = new QualifiedName(IUiConstants.PLUGIN_ID, "publishedIn"); //$NON-NLS-1$
-
- // ===========================================================================================================================
- // Fields
- // ===========================================================================================================================
-
- /**
- * The server manager used by the helper to obtain workspaces.
- */
- private final ServerManager serverManager;
-
- // ===========================================================================================================================
- // Constructors
- // ===========================================================================================================================
-
- /**
- * @param serverManager the server manager used by this helper (never <code>null</code>)
- */
- public DnaResourceHelper( ServerManager serverManager ) {
- CheckArg.isNotNull(serverManager, "serverManager"); //$NON-NLS-1$
- this.serverManager = serverManager;
- }
-
- // ===========================================================================================================================
- // Methods
- // ===========================================================================================================================
-
- /**
- * @param file the file that was just published
- * @param workspace the workspace where the file was published
- * @throws Exception if there is a problem setting the property
- */
- public void addPublishedProperty( IFile file,
- Workspace workspace ) throws Exception {
- CheckArg.isNotNull(file, "file"); //$NON-NLS-1$
- CheckArg.isNotNull(workspace, "workspace"); //$NON-NLS-1$
-
- Set<Workspace> workspaces = getPublishedOnWorkspaces(file);
- workspaces.add(workspace);
-
- // set new value
- setPublishedOnPropertyValue(file, workspaces);
- }
-
- /**
- * @param workspaces the workspaces used to create the property value
- * @return the property value
- */
- private String createPublishedPropertyValue( Set<Workspace> workspaces ) {
- StringBuilder value = new StringBuilder();
-
- for (Workspace workspace : workspaces) {
- value.append(createWorkspaceId(workspace)).append(DELIM);
- }
-
- return value.toString();
- }
-
- /**
- * @param workspace the workspace whose identifier is being created
- * @return the ID
- */
- private String createWorkspaceId( Workspace workspace ) {
- StringBuilder result = new StringBuilder();
- result.append(workspace.getServer().getUrl()).append(ID_DELIM).append(workspace.getServer().getUser()).append(ID_DELIM);
- result.append(workspace.getRepository().getName()).append(ID_DELIM);
- result.append(workspace.getName());
-
- return result.toString();
- }
-
- /**
- * @param file the file whose <code>Workspace</code>s it has been published on is being requested (never <code>null</code>)
- * @return the workspaces (never <code>null</code>)
- * @throws Exception if there is a problem reading one of the file's persistent properties or a problem with the server
- * manager
- */
- public Set<Workspace> getPublishedOnWorkspaces( IFile file ) throws Exception {
- CheckArg.isNotNull(file, "file"); //$NON-NLS-1$
-
- Set<Workspace> publishedOnWorkspaces = null;
- String value = file.getPersistentProperty(PUBLISHED_RESOURCE_PROPERTY);
-
- if (value == null) {
- publishedOnWorkspaces = new HashSet<Workspace>(1);
- } else {
- StringTokenizer wsTokenizer = new StringTokenizer(value, DELIM);
- publishedOnWorkspaces = new HashSet<Workspace>(wsTokenizer.countTokens());
-
- while (wsTokenizer.hasMoreTokens()) {
- StringTokenizer propsTokenizer = new StringTokenizer(wsTokenizer.nextToken(), ID_DELIM);
-
- PARSE_WORKSPACE: while (propsTokenizer.hasMoreTokens()) {
- String url = propsTokenizer.nextToken();
- String user = propsTokenizer.nextToken();
- Server server = this.serverManager.findServer(url, user);
-
- if ((server != null) && this.serverManager.ping(server).isOk()) {
- Collection<Repository> repositories = this.serverManager.getRepositories(server);
-
- if (!repositories.isEmpty()) {
- String repositoryName = propsTokenizer.nextToken();
-
- for (Repository repository : repositories) {
- if (repository.getName().equals(repositoryName)) {
- Collection<Workspace> workspaces = this.serverManager.getWorkspaces(repository);
-
- if (!workspaces.isEmpty()) {
- String workspaceName = propsTokenizer.nextToken();
-
- for (Workspace workspace : workspaces) {
- if (workspace.getName().equals(workspaceName)) {
- publishedOnWorkspaces.add(workspace);
- break PARSE_WORKSPACE;
- }
- }
- }
-
- }
- }
- }
- } else {
- // this will remove workspace as being one that the file has been published on
- break PARSE_WORKSPACE;
- }
- }
- }
- }
-
- return publishedOnWorkspaces;
- }
-
- /**
- * @param file the file whose published status is being requested (never <code>null</code>)
- * @return <code>true</code> if the file has been published to any DNA repository
- */
- public boolean isPublished( IFile file ) {
- CheckArg.isNotNull(file, "file"); //$NON-NLS-1$
-
- try {
- return !getPublishedOnWorkspaces(file).isEmpty();
- } catch (Exception e) {
- Activator.getDefault().log(new Status(Severity.ERROR, RestClientI18n.publishedResourcePropertyErrorMsg.text(file), e));
- }
-
- return false;
- }
-
- /**
- * @param file the file that was just unpublished
- * @param workspace the workspace where the file was unpublished
- * @throws Exception if there is a problem setting the property
- */
- public void removePublishedProperty( IFile file,
- Workspace workspace ) throws Exception {
- CheckArg.isNotNull(file, "file"); //$NON-NLS-1$
- CheckArg.isNotNull(workspace, "workspace"); //$NON-NLS-1$
-
- Set<Workspace> workspaces = getPublishedOnWorkspaces(file);
- workspaces.remove(workspace);
-
- // set new value
- setPublishedOnPropertyValue(file, workspaces);
- }
-
- /**
- * @param file the file whose property is being set
- * @param workspaces the workspaces the file has been published to or <code>null</code> if the file has not been published
- * @throws CoreException if there was a problem setting the property
- */
- private void setPublishedOnPropertyValue( IFile file,
- Set<Workspace> workspaces ) throws CoreException {
- if ((workspaces == null) || workspaces.isEmpty()) {
- file.setPersistentProperty(PUBLISHED_RESOURCE_PROPERTY, null);
- } else {
- String value = createPublishedPropertyValue(workspaces);
- file.setPersistentProperty(PUBLISHED_RESOURCE_PROPERTY, value);
- }
- }
-
-}
Deleted: 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-09-22 14:51:30 UTC (rev 1241)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/IUiConstants.java 2009-09-22 15:03:25 UTC (rev 1242)
@@ -1,124 +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;
-
-public interface IUiConstants {
-
- /**
- * The Plug-in's identifier.
- */
- String PLUGIN_ID = "org.jboss.dna.web.jcr.rest.client.swt"; //$NON-NLS-1$
-
- String ICON_FOLDER = "icons/"; //$NON-NLS-1$
-
- //
- // /icons/objects/
- //
-
- String OBJECT_ICONS_FOLDER = ICON_FOLDER + "objects/"; //$NON-NLS-1$
-
- String CHECKMARK_IMAGE = OBJECT_ICONS_FOLDER + "checkmark.gif"; //$NON-NLS-1$
-
- String REPOSITORY_IMAGE = OBJECT_ICONS_FOLDER + "repository.gif"; //$NON-NLS-1$
-
- String SERVER_IMAGE = OBJECT_ICONS_FOLDER + "server.gif"; //$NON-NLS-1$
-
- String WORKSPACE_IMAGE = OBJECT_ICONS_FOLDER + "workspace.gif"; //$NON-NLS-1$
-
- //
- // /icons/views/
- //
-
- String VIEWS_ICON_FOLDER = ICON_FOLDER + "views/"; //$NON-NLS-1$
-
- String BLANK_IMAGE = VIEWS_ICON_FOLDER + "blank.gif"; //$NON-NLS-1$
-
- String COLLAPSE_ALL_IMAGE = VIEWS_ICON_FOLDER + "collapse_all.gif"; //$NON-NLS-1$
-
- String DELETE_SERVER_IMAGE = VIEWS_ICON_FOLDER + "delete_server.gif"; //$NON-NLS-1$
-
- String DNA_IMAGE_16x = VIEWS_ICON_FOLDER + "dna_icon_16x.png"; //$NON-NLS-1$
-
- String EDIT_SERVER_IMAGE = VIEWS_ICON_FOLDER + "edit_server.gif"; //$NON-NLS-1$
-
- String ERROR_OVERLAY_IMAGE = VIEWS_ICON_FOLDER + "error_overlay.gif"; //$NON-NLS-1$
-
- String NEW_SERVER_IMAGE = VIEWS_ICON_FOLDER + "new_server.gif"; //$NON-NLS-1$
-
- String PUBLISH_IMAGE = VIEWS_ICON_FOLDER + "publish.png"; //$NON-NLS-1$
-
- String PUBLISHED_OVERLAY_IMAGE = VIEWS_ICON_FOLDER + "published_overlay.png"; //$NON-NLS-1$
-
- String REFRESH_IMAGE = VIEWS_ICON_FOLDER + "refresh.gif"; //$NON-NLS-1$
-
- String UNPUBLISH_IMAGE = VIEWS_ICON_FOLDER + "unpublish.png"; //$NON-NLS-1$
-
- //
- // /icons/wizards/
- //
-
- String WIZARD_ICONS_FOLDER = ICON_FOLDER + "wizards/"; //$NON-NLS-1$
-
- String DNA_WIZARD_BANNER_IMAGE = WIZARD_ICONS_FOLDER + "dna_wizard_banner.gif"; //$NON-NLS-1$
-
- //
- // Help Contexts
- //
-
- String HELP_CONTEXT_PREFIX = PLUGIN_ID + '.';
-
- String DNA_CONSOLE_HELP_CONTEXT = HELP_CONTEXT_PREFIX + "dnaConsoleHelpContext"; //$NON-NLS-1$
-
- String PREFERENCE_PAGE_HELP_CONTEXT = HELP_CONTEXT_PREFIX + "preferencesHelpContext"; //$NON-NLS-1$
-
- String PUBLISH_DIALOG_HELP_CONTEXT = HELP_CONTEXT_PREFIX + "publishDialogHelpContext"; //$NON-NLS-1$
-
- String SERVER_DIALOG_HELP_CONTEXT = HELP_CONTEXT_PREFIX + "serverDialogHelpContext"; //$NON-NLS-1$
-
- String SERVER_VIEW_HELP_CONTEXT = HELP_CONTEXT_PREFIX + "serverViewHelpContext"; //$NON-NLS-1$
-
- //
- // Jobs
- //
-
- /**
- * The <code>Job</code> framework job family for the DNA publishing and unpublishing operations.
- */
- String DNA_PUBLISHING_JOB_FAMILY = "dna.publishing.job.family"; //$NON-NLS-1$
-
- //
- // Preferences
- //
-
- /**
- * A preference for a list of file extensions that will not be part of publishing operations.
- */
- String FILTERED_FILE_EXTENSIONS_PREFERENCE = "dna.preference.filteredFileExtensions"; //$NON-NLS-1$
-
- /**
- * A preference for a list of folder names whose contents will not be part of publishing operations.
- */
- String FILTERED_FOLDER_NAMES_PREFERENCE = "dna.preference.filteredFolderNames"; //$NON-NLS-1$
-
-}
Deleted: 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.java 2009-09-22 14:51:30 UTC (rev 1241)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/RestClientI18n.java 2009-09-22 15:03:25 UTC (rev 1242)
@@ -1,193 +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.jboss.dna.common.i18n.I18n;
-
-/**
- * The <code>RestClientI18n</code> class provides localized messages.
- */
-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 dnaConsoleName;
- public static I18n dnaConsoleProblemCreatingHyperlinkMsg;
- public static I18n dnaConsoleFilePathNotFoundMsg;
-
- public static I18n dnaPreferencePageDescription;
- public static I18n dnaPreferencePageFilteredFileExtensionsLabel;
- public static I18n dnaPreferencePageFilteredFolderNamesLabel;
- public static I18n dnaPreferencePageMessage;
- public static I18n dnaPreferencePageTitle;
-
- public static I18n editServerActionText;
- public static I18n editServerActionToolTip;
-
- public static I18n errorDialogTitle;
-
- public static I18n missingImage;
-
- public static I18n newFilteredFileExtensionDialogLabel;
- public static I18n newFilteredFileExtensionDialogTitle;
-
- public static I18n newFilteredFolderNameDialogLabel;
- public static I18n newFilteredFolderNameDialogTitle;
-
- public static I18n newServerActionText;
- public static I18n newServerActionToolTip;
-
- public static I18n prefUtilsPropertyFileNotFound;
- public static I18n prefUtilsPropertyNotFound;
-
- public static I18n publishedLocationsDialogCopyUrlButton;
- public static I18n publishedLocationsDialogCopyUrlButtonToolTip;
- public static I18n publishedLocationsDialogErrorObtainingUrlMsg;
- public static I18n publishedLocationsDialogFileUrlColumnHeader;
- public static I18n publishedLocationsDialogMsg;
- public static I18n publishedLocationsDialogRepositoryColumnHeader;
- public static I18n publishedLocationsDialogServerUrlColumnHeader;
- public static I18n publishedLocationsDialogTitle;
- public static I18n publishedLocationsDialogUserColumnHeader;
- public static I18n publishedLocationsDialogWorkspaceColumnHeader;
-
- public static I18n publishedResourcePropertyErrorMsg;
-
- public static I18n publishJobCanceled;
- public static I18n publishJobDurationMsg;
- public static I18n publishJobDurationNoHoursMsg;
- public static I18n publishJobDurationNoHoursNoMinutesMsg;
- public static I18n publishJobDurationShortMsg;
- public static I18n publishJobPublish;
- public static I18n publishJobPublishCanceledMsg;
- public static I18n publishJobPublishFile;
- public static I18n publishJobPublishFileFailed;
- public static I18n publishJobPublishFileInfo;
- public static I18n publishJobPublishFileWarning;
- public static I18n publishJobPublishFinishedMsg;
- public static I18n publishJobPublishName;
- public static I18n publishJobPublishTaskName;
- public static I18n publishJobUnexpectedErrorMsg;
- public static I18n publishJobUnpublish;
- public static I18n publishJobUnpublishCanceledMsg;
- public static I18n publishJobUnpublishFile;
- public static I18n publishJobUnpublishFileFailed;
- public static I18n publishJobUnpublishFileInfo;
- public static I18n publishJobUnpublishFileWarning;
- public static I18n publishJobUnpublishFinishedMsg;
- public static I18n publishJobUnpublishName;
- public static I18n publishJobUnpublishTaskName;
-
- 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 publishWizardPublishErrorMsg;
- public static I18n publishWizardPublishTitle;
- public static I18n publishWizardUnpublishTitle;
- public static I18n publishWizardUnpublishErrorMsg;
-
- public static I18n reconnectJobTaskName;
-
- 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 serverPageTestConnectionLabel;
- public static I18n serverPageTestConnectionButton;
- public static I18n serverPageTestConnectionButtonToolTip;
- public static I18n serverPageTestConnectionDialogFailureMsg;
- public static I18n serverPageTestConnectionDialogTitle;
- public static I18n serverPageTestConnectionDialogSuccessMsg;
- public static I18n serverPageTitle;
- public static I18n serverPageUrlLabel;
- public static I18n serverPageUrlToolTip;
- public static I18n serverPageUserLabel;
- public static I18n serverPageUserToolTip;
-
- public static I18n serverReconnectActionText;
- public static I18n serverReconnectActionToolTip;
-
- public static I18n serverViewToolTip;
-
- public static I18n serverWizardEditServerErrorMsg;
- public static I18n serverWizardEditServerTitle;
- public static I18n serverWizardNewServerErrorMsg;
- public static I18n serverWizardNewServerTitle;
-
- public static I18n showPublishedLocationsErrorMsg;
-
- public static I18n testServerActionText;
- public static I18n testServerActionToolTip;
-
- static {
- try {
- I18n.initialize(RestClientI18n.class);
- } catch (Exception e) {
- System.err.println(e);
- }
- }
-
-}
Deleted: 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/RestClientI18n.properties 2009-09-22 14:51:30 UTC (rev 1241)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/RestClientI18n.properties 2009-09-22 15:03:25 UTC (rev 1242)
@@ -1,174 +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 = Discard
-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 server with URL of "{0}" and user "{1}?"
-deleteServerDialogTitle = Confirm Delete Server
-
-editServerActionText = Server Properties
-editServerActionToolTip = Edit server properties
-
-dnaConsoleName = DNA
-dnaConsoleProblemCreatingHyperlinkMsg = Unexpected problem creating hyperlink in DNA Console view
-dnaConsoleFilePathNotFoundMsg = A hyperlink could not be created in the DNA Message Console because the file path of "{0}" could not be found.
-
-dnaPreferencePageDescription = Add or remove filtered file extensions and folder names. Files with a matching file extension or files that are contained in a folder with a matching name will NOT be published to or unpublished from DNA repositories.
-dnaPreferencePageFilteredFileExtensionsLabel = Filtered File Extensions:
-dnaPreferencePageFilteredFolderNamesLabel = Filtered Folder Names:
-dnaPreferencePageMessage = DNA
-dnaPreferencePageTitle = DNA Preferences
-
-errorDialogTitle = Error
-
-missingImage = The following image cannot be found "{0}"
-
-newFilteredFileExtensionDialogLabel = File extension:
-newFilteredFileExtensionDialogTitle = New Filtered File Extension
-
-newFilteredFolderNameDialogLabel = Folder name:
-newFilteredFolderNameDialogTitle = New Filtered Folder Name
-
-newServerActionText = New Server
-newServerActionToolTip = Create a new server
-
-prefUtilsPropertyFileNotFound = The "{0}" property preference file is missing or could not be loaded. All property default values will be used.
-prefUtilsPropertyNotFound = The "{0}" property is missing. Default value of "{1}" will be used.
-
-publishedLocationsDialogCopyUrlButton = Copy URL
-publishedLocationsDialogCopyUrlButtonToolTip = Copy to the clipboard the selected workspace URL where the file is published
-publishedLocationsDialogErrorObtainingUrlMsg = Error obtaining URL
-publishedLocationsDialogFileUrlColumnHeader = Published URL
-publishedLocationsDialogMsg = The file "{0}" has been published to the following DNA workspaces:
-publishedLocationsDialogRepositoryColumnHeader = Repository
-publishedLocationsDialogServerUrlColumnHeader = Server URL
-publishedLocationsDialogTitle = Published Locations
-publishedLocationsDialogUserColumnHeader = User
-publishedLocationsDialogWorkspaceColumnHeader = Workspace
-
-publishedResourcePropertyErrorMsg = Error obtaining the "published" property from the resource "{0}"
-
-publishJobCanceled = Job {0} was canceled. See log for details.
-publishJobDurationMsg = {0} hour(s), {1} minute(s), {2} second(s)
-publishJobDurationNoHoursMsg = {0} minute(s), {1} second(s)
-publishJobDurationNoHoursNoMinutesMsg = {0} second(s)
-publishJobDurationShortMsg = less than 1 second
-publishJobPublish = [{0}] Publishing {4} file(s) to server "{1}" (repository "{2}", workspace "{3}") ...
-publishJobPublishCanceledMsg = [{0}] Publishing was canceled after {1} file(s) out of {2} were processed. Elapsed time: {3}.\n
-publishJobPublishFile = [{0}] + Published file "{1}" to URL "<em>{2}</em>"
-publishJobPublishFileFailed = [{0}] -- ERROR -- Publishing file "{1}" generated an ERROR message. See log.
-publishJobPublishFileInfo = [{0}] -- INFO -- Publishing file "{1}" generated an INFO message. See log.
-publishJobPublishFileWarning = [{0}] -- WARNING -- Publishing file "{1}" generated a WARNING message. See log.
-publishJobPublishFinishedMsg = [{0}] Done publishing. Elapsed time: {1}.\n
-publishJobPublishName = DNA Publish [{0}]
-publishJobPublishTaskName = Publishing resources [{0}]
-publishJobUnexpectedErrorMsg = Unexpected error occurred. See log for more details.
-publishJobUnpublish = [{0}] Unpublishing {4} file(s) from server "{1}" (repository "{2}", workspace "{3}") ...
-publishJobUnpublishCanceledMsg = [{0}] Unublishing was canceled after {1} file(s) out of {2} were processed. Elapsed time: {3}.\n
-publishJobUnpublishFile = [{0}] - Unpublished file "{1}"
-publishJobUnpublishFileFailed = [{0}] -- ERROR -- Unpublishing file "{0}" generated an ERROR message. See log.
-publishJobUnpublishFileInfo = [{0}] -- INFO -- Unpublishing file "{1}" generated an INFO message. See log.
-publishJobUnpublishFileWarning = [{0}] -- WARN -- Unpublishing file "{1}" generated a WARNING message. See log.
-publishJobUnpublishFinishedMsg = [{0}] Done unpublishing. Elapsed time: {1}. \n
-publishJobUnpublishName = DNA Unpublish [{0}]
-publishJobUnpublishTaskName = Unpublishing resources [{0}]
-
-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 resources will be published. 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 resources will be unpublished. 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
-
-publishWizardPublishErrorMsg = Error Publishing
-publishWizardPublishTitle = Publish
-publishWizardUnpublishErrorMsg = Error Unpublishing
-publishWizardUnpublishTitle = Unpublish
-
-reconnectJobTaskName = Connecting to server "{0}"
-
-serverReconnectActionText = Reconnect
-serverReconnectActionToolTip = Reconnect to the selected server
-
-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
-serverPageTestConnectionLabel = Validate server connection:
-serverPageTestConnectionButton = Test
-serverPageTestConnectionButtonToolTip = Try to establish a connection to the server
-serverPageTestConnectionDialogFailureMsg = Unable to connect using the specified server properties. The server properties could be invalid or the server may be offline.
-serverPageTestConnectionDialogTitle = Test Server Connection
-serverPageTestConnectionDialogSuccessMsg = Successfully connected using the specified server properties.
-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
-
-showPublishedLocationsErrorMsg = Unexpected problem showing published on locations. See log for more details.
-
-testServerActionText = Connect
-testServerActionToolTip = Connect to the server identified by the abover URL, user, and password
Deleted: 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-09-22 14:51:30 UTC (rev 1241)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/Utils.java 2009-09-22 15:03:25 UTC (rev 1242)
@@ -1,223 +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 static org.jboss.dna.web.jcr.rest.client.swt.IUiConstants.PLUGIN_ID;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.StringTokenizer;
-import java.util.TreeSet;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.ISharedImages;
-import org.jboss.dna.common.util.CheckArg;
-import org.jboss.dna.web.jcr.rest.client.Status;
-import org.jboss.dna.web.jcr.rest.client.Status.Severity;
-
-public final class Utils {
-
- // ===========================================================================================================================
- // Class Methods
- // ===========================================================================================================================
-
- /**
- * @param tokens the tokens being combined into one value
- * @param delimiter the character inserted to separate each token
- * @return the tokens separated by the delimiter
- */
- public static String combineTokens( String[] tokens,
- char delimiter ) {
- CheckArg.isNotNull(tokens, "tokens"); //$NON-NLS-1$
- StringBuilder value = new StringBuilder();
-
- for (String token : tokens) {
- value.append(token).append(delimiter);
- }
-
- return value.toString();
- }
-
- /**
- * Sizes the shell to the minimum of it's current size or the width and height display percentages.
- *
- * @param shell the shell being resized (if necessary) and located
- * @param widthPercentage a number between 1 and 100 indicating a percentage of the screen size (defaults to 50 if bad value)
- * @param heightPercentage a number between 1 and 100 indicating a percentage of the screen size (defaults to 50 if bad value)
- */
- public static void centerAndSizeShellRelativeToDisplay( Shell shell,
- int widthPercentage,
- int heightPercentage ) {
- if ((widthPercentage < 1) || (widthPercentage > 100)) {
- widthPercentage = 50;
- }
-
- if ((heightPercentage < 1) || (heightPercentage > 100)) {
- heightPercentage = 50;
- }
-
- // size
- Rectangle shellBounds = shell.getBounds();
- Rectangle displayBounds = shell.getDisplay().getClientArea();
- int scaledWidth = displayBounds.width * widthPercentage / 100;
- int scaledHeight = displayBounds.height * heightPercentage / 100;
- shell.setSize(Math.min(scaledWidth, shellBounds.width), Math.min(scaledHeight, shellBounds.height));
- Point size = shell.getSize();
-
- // center
- int excessX = displayBounds.width - size.x;
- int excessY = displayBounds.height - size.y;
- int x = displayBounds.x + (excessX / 2);
- int y = displayBounds.y + (excessY / 2);
-
- shell.setLocation(x, y);
- }
-
- /**
- * Converts the non-Eclipse status severity to an Eclipse severity level. An {@link Status.Severity#UNKNOWN unknown status} is
- * converted to {@link IStatus#CANCEL cancel}.
- *
- * @param severity the eclipse status severity level
- * @return the converted severity level (never <code>null</code>)
- * @see IStatus
- */
- public static int convertSeverity( Severity severity ) {
- if (severity == Severity.OK) return IStatus.OK;
- if (severity == Severity.ERROR) return IStatus.ERROR;
- if (severity == Severity.WARNING) return IStatus.WARNING;
- if (severity == Severity.INFO) return IStatus.INFO;
- return IStatus.CANCEL;
- }
-
- /**
- * Converts the Eclipse status severity level to a non-Eclipse severity.
- *
- * @param severity the eclipse status severity level
- * @return the converted severity level (never <code>null</code>)
- * @see IStatus
- */
- public static Severity convertSeverity( int severity ) {
- if (severity == IStatus.OK) return Severity.OK;
- if (severity == IStatus.ERROR) return Severity.ERROR;
- if (severity == IStatus.WARNING) return Severity.WARNING;
- if (severity == IStatus.INFO) return Severity.INFO;
- return Severity.UNKNOWN;
- }
-
- /**
- * @param status the status being converted (never <code>null</code>)
- * @return the Eclipse status object (never <code>null</code>)
- */
- public static IStatus convert( Status status ) {
- CheckArg.isNotNull(status, "status"); //$NON-NLS-1$
- return new org.eclipse.core.runtime.Status(convertSeverity(status.getSeverity()), PLUGIN_ID, status.getMessage(),
- status.getException());
- }
-
- /**
- * The OK status does not have an image.
- *
- * @param status the status whose image is being requested (never <code>null</code>)
- * @return the image or <code>null</code> if no associated image for the status severity
- */
- public static Image getImage( Status status ) {
- CheckArg.isNotNull(status, "status"); //$NON-NLS-1$
- String imageId = null;
-
- if (status.isError()) {
- imageId = ISharedImages.IMG_OBJS_ERROR_TSK;
- } else if (status.isInfo()) {
- imageId = ISharedImages.IMG_OBJS_INFO_TSK;
- } else if (status.isWarning()) {
- imageId = ISharedImages.IMG_OBJS_WARN_TSK;
- }
-
- if (imageId != null) {
- return Activator.getDefault().getSharedImage(imageId);
- }
-
- return null;
- }
-
- /**
- * @param string the string whose tokens are being requested (may be <code>null</code>)
- * @param delimiters the delimiters that separate the tokens (never <code>null</code>)
- * @param removeDuplicates a flag indicating if duplicate tokens should be removed
- * @return the tokens (never <code>null</code>)
- */
- public static String[] getTokens( String string,
- String delimiters,
- boolean removeDuplicates ) {
- CheckArg.isNotNull(delimiters, "delimiters"); //$NON-NLS-1$
-
- if (string == null) {
- return new String[0];
- }
-
- Collection<String> tokens = removeDuplicates ? new TreeSet<String>() : new ArrayList<String>();
- StringTokenizer st = new StringTokenizer(string, delimiters);
-
- while (st.hasMoreTokens()) {
- tokens.add(st.nextToken());
- }
-
- return tokens.toArray(new String[tokens.size()]);
- }
-
- /**
- * The image can be used to decorate an existing image.
- *
- * @param status the status whose image overlay is being requested (never <code>null</code>)
- * @return the image descriptor or <code>null</code> if none found for the status severity
- */
- public static ImageDescriptor getOverlayImage( Status status ) {
- CheckArg.isNotNull(status, "status"); //$NON-NLS-1$
- String imageId = null;
-
- if (status.isError()) {
- imageId = IUiConstants.ERROR_OVERLAY_IMAGE;
- }
-
- if (imageId != null) {
- return Activator.getDefault().getImageDescriptor(imageId);
- }
-
- return null;
- }
-
- // ===========================================================================================================================
- // Constructors
- // ===========================================================================================================================
-
- /**
- * Don't allow construction.
- */
- public Utils() {
- // nothing to do
- }
-
-}
Deleted: 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 2009-09-22 14:51:30 UTC (rev 1241)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/package-info.java 2009-09-22 15:03:25 UTC (rev 1242)
@@ -1,27 +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.
- */
-/**
- * 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
More information about the dna-commits
mailing list