[jbosstools-commits] JBoss Tools SVN: r30268 - in branches/jbosstools-3.2.x/modeshape: plugins/org.jboss.tools.modeshape.rest and 11 other directories.

Author: elvisisking Date: 2011-04-04 10:26:19 -0400 (Mon, 04 Apr 2011) New Revision: 30268 Added: branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/WorkspaceArea.java branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/preferences/FileFiltersPreferencePage.java branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/preferences/PreferenceInitializer.java branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/preferences/SortedListEditor.java branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/slf4j/ branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/slf4j/impl/ branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/slf4j/impl/StaticLoggerBinder.java Removed: branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/log/StaticLoggerBinder.java branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/preferences/NewItemDialog.java Modified: branches/jbosstools-3.2.x/modeshape/features/org.jboss.tools.modeshape.rest.feature/feature.xml branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/modeshape-client.jar branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/plugin.properties branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/plugin.xml branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/log4j.properties branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/Activator.java branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/IUiConstants.java branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/RestClientI18n.java branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/RestClientI18n.properties branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/ServerManager.java branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/jobs/PublishJob.java branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/log/EclipseLogger.java branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/preferences/FilteredFileExtensionEditor.java branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/preferences/FilteredFoldersEditor.java branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/preferences/ModeShapePreferencePage.java branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/preferences/PrefUtils.java branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/preferences/PublishingFileFilter.java branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/preferences/prefs.properties branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/views/ServerView.java branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/wizards/PublishPage.java branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/wizards/PublishWizard.java branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/wizards/ServerPage.java branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/wizards/ServerWizard.java branches/jbosstools-3.2.x/modeshape/tests/org.jboss.tools.modeshape.rest.test/src/org/jboss/tools/modeshape/rest/MockRestClient.java Log: JBDS-1403 The known repository workspace areas are now shown to the user in a ComboBox. The user can choose one of those or enter on of their own. JBIDE-6656 Created a documentation-only plugin. Moved the context help pages into this new plugin. JBIDE-8242 Created a preference user can set to version files that are published. At the time of publishing the user can override this preference. JBIDE-8396 Filter folder and file names preference now doesn't allow duplicates. JBIDE-8661 SLF4J logging is fixed. Trace logging is mapped to Elipse's "info" messages. Still need to update to the ModeShape 2.5.0 GA jar when released (using a beta jar now). Also have to update the Eclipse context help images and pages. Modified: branches/jbosstools-3.2.x/modeshape/features/org.jboss.tools.modeshape.rest.feature/feature.xml =================================================================== --- branches/jbosstools-3.2.x/modeshape/features/org.jboss.tools.modeshape.rest.feature/feature.xml 2011-04-04 13:59:30 UTC (rev 30267) +++ branches/jbosstools-3.2.x/modeshape/features/org.jboss.tools.modeshape.rest.feature/feature.xml 2011-04-04 14:26:19 UTC (rev 30268) @@ -42,4 +42,10 @@ install-size="0" version="0.0.0"/> + <plugin + id="org.jboss.tools.modeshape.rest.doc.user" + download-size="0" + install-size="0" + version="0.0.0"/> + </feature> Modified: branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/modeshape-client.jar =================================================================== (Binary files differ) Modified: branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/plugin.properties =================================================================== --- branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/plugin.properties 2011-04-04 13:59:30 UTC (rev 30267) +++ branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/plugin.properties 2011-04-04 14:26:19 UTC (rev 30268) @@ -14,7 +14,9 @@ contextMenu.label = ModeShape decorator.description = Decorates objects in the ModeShape View decorator.label = ModeShape View Decorator +fileFiltersPreferencePage = File Filters modeShapeCategory = ModeShape +preferenceInitializer = Preference Initializer for default values publishCommand.name = Publish serverView = ModeShape showPublishedLocationsCommand.name = Show Published Locations Modified: branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/plugin.xml =================================================================== --- branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/plugin.xml 2011-04-04 13:59:30 UTC (rev 30267) +++ branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/plugin.xml 2011-04-04 14:26:19 UTC (rev 30268) @@ -199,17 +199,7 @@ </decorator> </extension> -<!-- Context Help --> - <extension point="org.eclipse.help.contexts"> - <contexts file="docs/helpContexts.xml" /> - </extension> - -<!-- Help Table of Contents --> - <extension point="org.eclipse.help.toc"> - <toc file="docs/toc.xml" primary="true" /> - </extension> - -<!-- Preference Page --> +<!-- Main Preference Page --> <extension point="org.eclipse.ui.preferencePages"> <page @@ -218,4 +208,24 @@ id="modeShapePreferencePage"> </page> </extension> + +<!-- File Filters Preference Page --> + <extension + point="org.eclipse.ui.preferencePages"> + <page + name="%fileFiltersPreferencePage" + category="modeShapePreferencePage" + class="org.jboss.tools.modeshape.rest.preferences.FileFiltersPreferencePage" + id="modeShapeFileFiltersPreferencePage"> + </page> + +<!-- Preference Initializer --> + </extension> + <extension + point="org.eclipse.core.runtime.preferences" + id="modeShapeDefaultPreferenceInitializer" + name="%preferenceInitializer"> + <initializer class="org.jboss.tools.modeshape.rest.preferences.PreferenceInitializer" /> + </extension> + </plugin> Modified: branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/log4j.properties =================================================================== --- branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/log4j.properties 2011-04-04 13:59:30 UTC (rev 30267) +++ branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/log4j.properties 2011-04-04 14:26:19 UTC (rev 30268) @@ -14,8 +14,6 @@ log4j.rootLogger=INFO, LOGFILE log4j.appender.LOGFILE=org.apache.log4j.FileAppender -log4j.appender.LOGFILE.File=eclipse.log log4j.appender.LOGFILE.Append=true -log4j.appender.LOGFILE.Threshold=INFO log4j.appender.LOGFILE.layout=org.apache.log4j.PatternLayout log4j.appender.LOGFILE.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n Modified: branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/Activator.java =================================================================== --- branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/Activator.java 2011-04-04 13:59:30 UTC (rev 30267) +++ branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/Activator.java 2011-04-04 14:26:19 UTC (rev 30268) @@ -13,6 +13,7 @@ import java.net.MalformedURLException; import java.net.URL; + import org.eclipse.core.runtime.IStatus; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.resource.ImageRegistry; @@ -35,19 +36,11 @@ */ 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 */ @@ -55,10 +48,6 @@ return plugin; } - // =========================================================================================================================== - // Fields - // =========================================================================================================================== - /** * The image used when the requested image cannot be found. */ @@ -69,19 +58,15 @@ */ 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"); + CheckArg.isNotNull(key, "key"); //$NON-NLS-1$ try { - URL url = new URL(getBundle().getEntry("/").toString() + key); + 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)); @@ -106,7 +91,7 @@ * @see ISharedImages */ public Image getSharedImage( String imageId ) { - CheckArg.isNotNull(imageId, "imageId"); + CheckArg.isNotNull(imageId, "imageId"); //$NON-NLS-1$ Image result = PlatformUI.getWorkbench().getSharedImages().getImage(imageId); return ((result == null) ? getMissingImage() : result); } @@ -117,7 +102,7 @@ * @see ISharedImages */ public ImageDescriptor getSharedImageDescriptor( String imageId ) { - CheckArg.isNotNull(imageId, "imageId"); + CheckArg.isNotNull(imageId, "imageId"); //$NON-NLS-1$ ImageDescriptor result = PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(imageId); if (result != null) { @@ -208,9 +193,10 @@ * @param status the status being logged (never <code>null</code>) */ public void log( Status status ) { - CheckArg.isNotNull(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(), + IUiConstants.PLUGIN_ID, + status.getMessage(), status.getException()); getLog().log(eclipseStatus); } @@ -222,11 +208,10 @@ */ @Override public void start( BundleContext context ) throws Exception { -// BasicConfigurator.configure(); // TODO how does logging get configured now - super.start(context); plugin = this; + // restore server registry this.serverMgr = new ServerManager(getStateLocation().toFile().getAbsolutePath()); Status status = this.serverMgr.restoreState(); Modified: branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/IUiConstants.java =================================================================== --- branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/IUiConstants.java 2011-04-04 13:59:30 UTC (rev 30267) +++ branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/IUiConstants.java 2011-04-04 14:26:19 UTC (rev 30268) @@ -16,97 +16,134 @@ /** * The Plug-in's identifier. */ - String PLUGIN_ID = "org.jboss.tools.modeshape.rest"; + String PLUGIN_ID = "org.jboss.tools.modeshape.rest"; //$NON-NLS-1$ - String ICON_FOLDER = "icons/"; + String ICON_FOLDER = "icons/"; //$NON-NLS-1$ // // /icons/objects/ // - String OBJECT_ICONS_FOLDER = ICON_FOLDER + "objects/"; + String OBJECT_ICONS_FOLDER = ICON_FOLDER + "objects/"; //$NON-NLS-1$ - String CHECKMARK_IMAGE = OBJECT_ICONS_FOLDER + "checkmark.gif"; + String CHECKMARK_IMAGE = OBJECT_ICONS_FOLDER + "checkmark.gif"; //$NON-NLS-1$ - String REPOSITORY_IMAGE = OBJECT_ICONS_FOLDER + "repository.gif"; + String REPOSITORY_IMAGE = OBJECT_ICONS_FOLDER + "repository.gif"; //$NON-NLS-1$ - String SERVER_IMAGE = OBJECT_ICONS_FOLDER + "server.gif"; + String SERVER_IMAGE = OBJECT_ICONS_FOLDER + "server.gif"; //$NON-NLS-1$ - String WORKSPACE_IMAGE = OBJECT_ICONS_FOLDER + "workspace.gif"; + String WORKSPACE_IMAGE = OBJECT_ICONS_FOLDER + "workspace.gif"; //$NON-NLS-1$ // // /icons/views/ // - String VIEWS_ICON_FOLDER = ICON_FOLDER + "views/"; + String VIEWS_ICON_FOLDER = ICON_FOLDER + "views/"; //$NON-NLS-1$ - String BLANK_IMAGE = VIEWS_ICON_FOLDER + "blank.gif"; + String BLANK_IMAGE = VIEWS_ICON_FOLDER + "blank.gif"; //$NON-NLS-1$ - String COLLAPSE_ALL_IMAGE = VIEWS_ICON_FOLDER + "collapse_all.gif"; + String COLLAPSE_ALL_IMAGE = VIEWS_ICON_FOLDER + "collapse_all.gif"; //$NON-NLS-1$ - String DELETE_SERVER_IMAGE = VIEWS_ICON_FOLDER + "delete_server.gif"; + String DELETE_SERVER_IMAGE = VIEWS_ICON_FOLDER + "delete_server.gif"; //$NON-NLS-1$ - String ModeShape_IMAGE_16x = VIEWS_ICON_FOLDER + "modeShape_icon_16x.png"; + String ModeShape_IMAGE_16x = VIEWS_ICON_FOLDER + "modeShape_icon_16x.png"; //$NON-NLS-1$ - String EDIT_SERVER_IMAGE = VIEWS_ICON_FOLDER + "edit_server.gif"; + String EDIT_SERVER_IMAGE = VIEWS_ICON_FOLDER + "edit_server.gif"; //$NON-NLS-1$ - String ERROR_OVERLAY_IMAGE = VIEWS_ICON_FOLDER + "error_overlay.gif"; + String ERROR_OVERLAY_IMAGE = VIEWS_ICON_FOLDER + "error_overlay.gif"; //$NON-NLS-1$ - String NEW_SERVER_IMAGE = VIEWS_ICON_FOLDER + "new_server.gif"; + String NEW_SERVER_IMAGE = VIEWS_ICON_FOLDER + "new_server.gif"; //$NON-NLS-1$ - String PUBLISH_IMAGE = VIEWS_ICON_FOLDER + "publish.png"; + String PUBLISH_IMAGE = VIEWS_ICON_FOLDER + "publish.png"; //$NON-NLS-1$ - String PUBLISHED_OVERLAY_IMAGE = VIEWS_ICON_FOLDER + "published_overlay.png"; + String PUBLISHED_OVERLAY_IMAGE = VIEWS_ICON_FOLDER + "published_overlay.png"; //$NON-NLS-1$ - String REFRESH_IMAGE = VIEWS_ICON_FOLDER + "refresh.gif"; + String REFRESH_IMAGE = VIEWS_ICON_FOLDER + "refresh.gif"; //$NON-NLS-1$ - String UNPUBLISH_IMAGE = VIEWS_ICON_FOLDER + "unpublish.png"; + String UNPUBLISH_IMAGE = VIEWS_ICON_FOLDER + "unpublish.png"; //$NON-NLS-1$ // // /icons/wizards/ // - String WIZARD_ICONS_FOLDER = ICON_FOLDER + "wizards/"; + String WIZARD_ICONS_FOLDER = ICON_FOLDER + "wizards/"; //$NON-NLS-1$ - String WIZARD_BANNER_IMAGE = WIZARD_ICONS_FOLDER + "wizard_banner.png"; + String WIZARD_BANNER_IMAGE = WIZARD_ICONS_FOLDER + "wizard_banner.png"; //$NON-NLS-1$ // - // Help Contexts + // jobs // - String HELP_CONTEXT_PREFIX = PLUGIN_ID + '.'; - - String MESSAGE_CONSOLE_HELP_CONTEXT = HELP_CONTEXT_PREFIX + "messageConsoleHelpContext"; - - String PREFERENCE_PAGE_HELP_CONTEXT = HELP_CONTEXT_PREFIX + "preferencesHelpContext"; - - String PUBLISH_DIALOG_HELP_CONTEXT = HELP_CONTEXT_PREFIX + "publishDialogHelpContext"; - - String SERVER_DIALOG_HELP_CONTEXT = HELP_CONTEXT_PREFIX + "serverDialogHelpContext"; - - String SERVER_VIEW_HELP_CONTEXT = HELP_CONTEXT_PREFIX + "serverViewHelpContext"; - - // - // Jobs - // - /** * The <code>Job</code> framework job family for the ModeShape publishing and unpublishing operations. */ - String PUBLISHING_JOB_FAMILY = "modeshape.publishing.job.family"; + String PUBLISHING_JOB_FAMILY = "modeshape.publishing.job.family"; //$NON-NLS-1$ - // - // Preferences - // - /** - * A preference for a list of file extensions that will not be part of publishing operations. + * Constants associated with help contexts. */ - String FILTERED_FILE_EXTENSIONS_PREFERENCE = "modeShape.preference.filteredFileExtensions"; + interface HelpContexts { + String HELP_CONTEXT_PREFIX = IUiConstants.PLUGIN_ID + '.'; + + /** + * The message console help context. + */ + String MESSAGE_CONSOLE_HELP_CONTEXT = HELP_CONTEXT_PREFIX + "messageConsoleHelpContext"; //$NON-NLS-1$ + + /** + * The preference pages help context. + */ + String PREFERENCE_PAGE_HELP_CONTEXT = HELP_CONTEXT_PREFIX + "preferencesHelpContext"; //$NON-NLS-1$ + + /** + * The publish and unpublish dialog help context. + */ + String PUBLISH_DIALOG_HELP_CONTEXT = HELP_CONTEXT_PREFIX + "publishDialogHelpContext"; //$NON-NLS-1$ + + /** + * The server wizard and dialog page help context. + */ + String SERVER_DIALOG_HELP_CONTEXT = HELP_CONTEXT_PREFIX + "serverDialogHelpContext"; //$NON-NLS-1$ + + /** + * The server view help context. + */ + String SERVER_VIEW_HELP_CONTEXT = HELP_CONTEXT_PREFIX + "serverViewHelpContext"; //$NON-NLS-1$ + + } + /** - * A preference for a list of folder names whose contents will not be part of publishing operations. + * Constants associated with preferences. */ - String FILTERED_FOLDER_NAMES_PREFERENCE = "modeShape.preference.filteredFolderNames"; + interface Preferences { + /** + * A preference that indicates if the ModeShape server should use resource versioning. If versioning is not used, only one + * copy of the resource will be persisted. + */ + String ENABLE_RESOURCE_VERSIONING = "modeShape.preference.filteredFileExtensions"; //$NON-NLS-1$ + + /** + * A preference for a list of file extensions that will not be part of publishing operations. + */ + String FILTERED_FILE_EXTENSIONS_PREFERENCE = "modeShape.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 = "modeShape.preference.filteredFolderNames"; //$NON-NLS-1$ + + /** + * The file and folder preference page ID. + */ + String FILTERS_PREFERENCE_PAGE_ID = "modeShapeFileFiltersPreferencePage"; //$NON-NLS-1$ + + /** + * The main ModeShape preference page ID. + */ + String MAIN_PREFERENCE_PAGE_ID = "modeShapePreferencePage"; //$NON-NLS-1$ + + } + } Modified: branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/RestClientI18n.java =================================================================== --- branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/RestClientI18n.java 2011-04-04 13:59:30 UTC (rev 30267) +++ branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/RestClientI18n.java 2011-04-04 14:26:19 UTC (rev 30268) @@ -38,6 +38,12 @@ public static I18n errorRestoringServerRegistry; public static I18n errorSavingServerRegistry; + public static I18n fileFiltersPreferencePageDescription; + public static I18n fileFiltersPreferencePageFilteredFileExtensionsLabel; + public static I18n fileFiltersPreferencePageFilteredFolderNamesLabel; + public static I18n fileFiltersPreferencePageMessage; + public static I18n fileFiltersPreferencePageTitle; + public static I18n missingImage; public static I18n newFilteredFileExtensionDialogLabel; @@ -45,13 +51,12 @@ public static I18n newFilteredFolderNameDialogLabel; public static I18n newFilteredFolderNameDialogTitle; + + public static I18n newItemDialogValueExists; 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 publishedLocationsDialogFileUrlColumnHeader; @@ -68,9 +73,13 @@ public static I18n publishingConsoleProblemCreatingHyperlinkMsg; public static I18n publishingConsoleFilePathNotFoundMsg; + public static I18n preferenceDefaultScopeNotFound; + public static I18n preferenceFileNotFound; + public static I18n preferenceNotFound; + public static I18n preferencePageDescription; - public static I18n preferencePageFilteredFileExtensionsLabel; - public static I18n preferencePageFilteredFolderNamesLabel; + public static I18n preferencePageEnableVersioningEditor; + public static I18n preferencePageEnableVersioningEditorToolTip; public static I18n preferencePageMessage; public static I18n preferencePageTitle; @@ -110,6 +119,7 @@ public static I18n publishPageNoAvailableWorkspacesStatusMsg; public static I18n publishPageNoResourcesToPublishStatusMsg; public static I18n publishPageNoResourcesToUnpublishStatusMsg; + public static I18n publishPageOpenPreferencePageLink; public static I18n publishPagePublishOkStatusMsg; public static I18n publishPagePublishResourcesLabel; public static I18n publishPageRecurseCheckBox; @@ -119,9 +129,12 @@ public static I18n publishPageRepositoryToolTip; public static I18n publishPageServerLabel; public static I18n publishPageServerToolTip; + public static I18n publishPageUnableToObtainWorkspaceAreas; public static I18n publishPageUnpublishOkStatusMsg; public static I18n publishPageUnpublishResourcesLabel; public static I18n publishPageUnpublishTitle; + public static I18n publishPageVersionCheckBox; + public static I18n publishPageVersionCheckBoxToolTip; public static I18n publishPageWorkspaceLabel; public static I18n publishPageWorkspacePublishToolTip; public static I18n publishPageWorkspaceUnpublishToolTip; Modified: branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/RestClientI18n.properties =================================================================== --- branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/RestClientI18n.properties 2011-04-04 13:59:30 UTC (rev 30267) +++ branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/RestClientI18n.properties 2011-04-04 14:26:19 UTC (rev 30268) @@ -29,6 +29,12 @@ errorDialogTitle = Error errorRestoringServerRegistry = Error trying to restore the server registry from file "{0}" errorSavingServerRegistry = Error trying to save the server registry to "{0}" + +fileFiltersPreferencePageDescription = Add or remove 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 repositories. +fileFiltersPreferencePageFilteredFileExtensionsLabel = Filtered File Extensions: +fileFiltersPreferencePageFilteredFolderNamesLabel = Filtered Folder Names: +fileFiltersPreferencePageMessage = File Filters +fileFiltersPreferencePageTitle = File Filters missingImage = The following image cannot be found "{0}" @@ -38,11 +44,14 @@ newFilteredFolderNameDialogLabel = Folder name: newFilteredFolderNameDialogTitle = New Filtered Folder Name +newItemDialogValueExists = Value already exists + 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. +preferenceDefaultScopeNotFound = The default scope for plugin "{0}" cannot be found. +preferenceFileNotFound = The "{0}" preference defaults value file is missing or could not be loaded. +preferenceNotFound = 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 @@ -60,11 +69,11 @@ publishingConsoleProblemCreatingHyperlinkMsg = Unexpected problem creating hyperlink in ModeShape Message Console view publishingConsoleFilePathNotFoundMsg = A hyperlink could not be created in the ModeShape Message Console because the file path of "{0}" could not be found. -preferencePageDescription = Add or remove 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 repositories. -preferencePageFilteredFileExtensionsLabel = Filtered File Extensions: -preferencePageFilteredFolderNamesLabel = Filtered Folder Names: +preferencePageDescription = General settings for ModeShape Tools: +preferencePageEnableVersioningEditor = Enable resource versioning +preferencePageEnableVersioningEditorToolTip = Inform ModeShape server to keep multiple versions of resources preferencePageMessage = ModeShape -preferencePageTitle = ModeShape Preferences +preferencePageTitle = ModeShape publishJobCanceled = Job {0} was canceled. See log for details. publishJobDurationMsg = {0} hour(s), {1} minute(s), {2} second(s) @@ -97,12 +106,13 @@ publishPageMissingServerStatusMsg = A server must be selected publishPageMissingWorkspaceStatusMsg = A workspace must be selected publishPageNewServerButton = New... -publishPageNoAvailableRepositoriesStatusMsg = There are no repositories available on that server +publishPageNoAvailableRepositoriesStatusMsg = There are no repositories available on that server, or a \nconnection to the server cannot be made. publishPageNoAvailableServersStatusMsg = A server must be created first -publishPageNoAvailableWorkspacesStatusMsg = There are no JCR workspaces available on that server and repository -publishPageNoResourcesToPublishStatusMsg = There are no files that can be published +publishPageNoAvailableWorkspacesStatusMsg = There are no JCR workspaces available on that server and repository, or a \nconnection to the server cannot be made. +publishPageNoResourcesToPublishStatusMsg = There are no files that can be published (may be due to your file filter preference). publishPageNoResourcesToUnpublishStatusMsg = There are no files that can be unpublished -publishPagePublishOkStatusMsg = Choose the location of the JCR repository where your local files and folders will be published, and then click "Finish". +publishPageOpenPreferencePageLink = ( change default in your <a>preferences</a> ) +publishPagePublishOkStatusMsg = Choose the location of the JCR repository where your local files \nand folders will be published, and then click "Finish." publishPagePublishResourcesLabel = These files were selected and will be published: publishPageRecurseCheckBox = Recurse folders and projects publishPageRecurseCheckBoxToolTip = Add all files under folders recursively under selected projects and folders @@ -111,6 +121,9 @@ publishPageRepositoryToolTip = The JCR repository where the JCR workspace is located publishPageServerLabel = Server: publishPageServerToolTip = The server where the JCR repository is located +publishPageUnableToObtainWorkspaceAreas = Unable to obtain the workspace areas for workspace "{0}" +publishPageVersionCheckBox = Version the published files +publishPageVersionCheckBoxToolTip = The published files will be versioned on the ModeShape server. publishPageUnpublishOkStatusMsg = Choose the location of the JCR repository where the files will be unpublished, and then click "Finish". publishPageUnpublishResourcesLabel = These files were selected and will be unpublished: publishPageUnpublishTitle = Unpublish the selected files Modified: branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/ServerManager.java =================================================================== --- branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/ServerManager.java 2011-04-04 13:59:30 UTC (rev 30267) +++ branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/ServerManager.java 2011-04-04 14:26:19 UTC (rev 30268) @@ -23,6 +23,7 @@ import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; + import javax.jcr.nodetype.NodeType; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; @@ -31,11 +32,14 @@ import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; + import net.jcip.annotations.GuardedBy; import net.jcip.annotations.ThreadSafe; + import org.modeshape.common.util.Base64; import org.modeshape.common.util.CheckArg; import org.modeshape.common.util.Logger; +import org.modeshape.web.jcr.rest.client.IJcrConstants; import org.modeshape.web.jcr.rest.client.IRestClient; import org.modeshape.web.jcr.rest.client.Status; import org.modeshape.web.jcr.rest.client.Status.Severity; @@ -56,50 +60,42 @@ @ThreadSafe public final class ServerManager implements IRestClient { - // =========================================================================================================================== - // Constants - // =========================================================================================================================== - /** * The tag used to persist a server's login password. */ - private static final String PASSWORD_TAG = "password"; + private static final String PASSWORD_TAG = "password"; //$NON-NLS-1$ /** * The file name used when persisting the server registry. */ - private static final String REGISTRY_FILE = "serverRegistry.xml"; + private static final String REGISTRY_FILE = "serverRegistry.xml"; //$NON-NLS-1$ /** * The name of the system property that is set when at least one server exists. This property is used by the menus extension * that is responsible for showing the ModeShape context menu items. */ - public static final String SERVER_EXISTS_PROPERTY = "org.jboss.tools.modeshape.rest.serverExists"; + public static final String SERVER_EXISTS_PROPERTY = "org.jboss.tools.modeshape.rest.serverExists"; //$NON-NLS-1$ /** * The tag used when persisting a server. */ - private static final String SERVER_TAG = "server"; + private static final String SERVER_TAG = "server"; //$NON-NLS-1$ /** * The server collection tag used when persisting the server registry. */ - private static final String SERVERS_TAG = "servers"; + private static final String SERVERS_TAG = "servers"; //$NON-NLS-1$ /** * The tag used to persist a server's URL. */ - private static final String URL_TAG = "url"; + private static final String URL_TAG = "url"; //$NON-NLS-1$ /** * The tag used to persist a server's login user. */ - private static final String USER_TAG = "user"; + private static final String USER_TAG = "user"; //$NON-NLS-1$ - // =========================================================================================================================== - // Fields - // =========================================================================================================================== - /** * The listeners registered to receive {@link ServerRegistryEvent server registry events}. */ @@ -131,10 +127,6 @@ */ private final ReadWriteLock serverLock = new ReentrantReadWriteLock(); - // =========================================================================================================================== - // Constructors - // =========================================================================================================================== - /** * @param stateLocationPath the directory where the {@link Server} registry} is persisted (may be <code>null</code> if * persistence is not desired) @@ -142,7 +134,7 @@ */ public ServerManager( String stateLocationPath, IRestClient restClient ) { - CheckArg.isNotNull(restClient, "restClient"); + CheckArg.isNotNull(restClient, "restClient"); //$NON-NLS-1$ this.servers = new ArrayList<Server>(); this.stateLocationPath = stateLocationPath; @@ -160,10 +152,6 @@ this(stateLocationPath, new JsonRestClient()); } - // =========================================================================================================================== - // Methods - // =========================================================================================================================== - /** * Listeners already registered will not be added again. The new listener will receive events for all existing servers. * @@ -171,7 +159,7 @@ * @return <code>true</code> if listener was added */ public boolean addRegistryListener( IServerRegistryListener listener ) { - CheckArg.isNotNull(listener, "listener"); + CheckArg.isNotNull(listener, "listener"); //$NON-NLS-1$ boolean result = this.listeners.addIfAbsent(listener); // inform new listener of registered servers @@ -189,7 +177,7 @@ * @return a status indicating if the server was added to the registry */ public Status addServer( PersistedServer server ) { - CheckArg.isNotNull(server, "server"); + CheckArg.isNotNull(server, "server"); //$NON-NLS-1$ return internalAddServer(server, true); } @@ -200,8 +188,8 @@ */ public Server findServer( String url, String user ) { - CheckArg.isNotNull(url, "url"); - CheckArg.isNotNull(user, "user"); + CheckArg.isNotNull(url, "url"); //$NON-NLS-1$ + CheckArg.isNotNull(user, "user"); //$NON-NLS-1$ for (Server server : getServers()) { if (url.equals(server.getUrl()) && user.equals(server.getUser())) { @@ -246,7 +234,7 @@ */ @Override public Collection<Repository> getRepositories( Server server ) throws Exception { - CheckArg.isNotNull(server, "server"); + CheckArg.isNotNull(server, "server"); //$NON-NLS-1$ try { this.serverLock.readLock().lock(); @@ -277,6 +265,26 @@ } /** + * @param workspace the workspace whose publishing areas are being requested + * @return the workspace areas (never <code>null</code>) + * @throws Exception if there is a problem obtaining the workspace areas + */ + public WorkspaceArea[] getWorkspaceAreas( Workspace workspace ) throws Exception { + final String path = "jcr:path"; //$NON-NLS-1$ + final String title = "jcr:title"; //$NON-NLS-1$ + final String statement = "SELECT [" + path + "], " + '[' + title + ']' + " FROM [mode:publishArea]"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + List<QueryRow> rows = query(workspace, IJcrConstants.JCR_SQL2, statement); + WorkspaceArea[] workspaceAreas = new WorkspaceArea[rows.size()]; + + for (int numRows = rows.size(), i = 0; i < numRows; ++i) { + QueryRow row = rows.get(i); + workspaceAreas[i] = new WorkspaceArea(workspace, (String)row.getValue(path), (String)row.getValue(title)); + } + + return workspaceAreas; + } + + /** * {@inheritDoc} * * @see org.modeshape.web.jcr.rest.client.IRestClient#getWorkspaces(org.modeshape.web.jcr.rest.client.domain.Repository) @@ -285,7 +293,7 @@ */ @Override public Collection<Workspace> getWorkspaces( Repository repository ) throws Exception { - CheckArg.isNotNull(repository, "repository"); + CheckArg.isNotNull(repository, "repository"); //$NON-NLS-1$ try { this.serverLock.readLock().lock(); @@ -295,8 +303,7 @@ return Collections.unmodifiableCollection(new ArrayList<Workspace>(workspaces)); } - // a repository's server must be registered in order to obtain it's - // workspaces + // a repository's server must be registered in order to obtain it's workspaces String msg = RestClientI18n.serverManagerUnregisteredServer.text(repository.getServer().getShortDescription()); throw new RuntimeException(msg); } finally { @@ -331,7 +338,7 @@ if (serverExists == null) { // value of "true" is coded in the plugin.xml as well - System.setProperty(SERVER_EXISTS_PROPERTY, "true"); + System.setProperty(SERVER_EXISTS_PROPERTY, "true"); //$NON-NLS-1$ } // let listeners know of new server @@ -395,7 +402,7 @@ * @return <code>true</code> if the server has been registered */ public boolean isRegistered( Server server ) { - CheckArg.isNotNull(server, "server"); + CheckArg.isNotNull(server, "server"); //$NON-NLS-1$ try { this.serverLock.readLock().lock(); @@ -471,7 +478,7 @@ * @see #isRegistered(Server) */ public Status ping( Server server ) { - CheckArg.isNotNull(server, "server"); + CheckArg.isNotNull(server, "server"); //$NON-NLS-1$ try { this.delegate.getRepositories(server); @@ -483,8 +490,6 @@ /** * {@inheritDoc} - * <p> - * Only tries to unpublish if the workspace's {@link Server server} is registered. * * @see org.modeshape.web.jcr.rest.client.IRestClient#publish(org.modeshape.web.jcr.rest.client.domain.Workspace, * java.lang.String, java.io.File) @@ -494,14 +499,28 @@ public Status publish( Workspace workspace, String path, File file ) { - CheckArg.isNotNull(workspace, "workspace"); - CheckArg.isNotNull(path, "path"); - CheckArg.isNotNull(file, "file"); + return publish(workspace, path, file, false); + } + /** + * {@inheritDoc} + * + * @see org.modeshape.web.jcr.rest.client.IRestClient#publish(org.modeshape.web.jcr.rest.client.domain.Workspace, + * java.lang.String, java.io.File, boolean) + */ + @Override + public Status publish( Workspace workspace, + String path, + File file, + boolean version ) { + CheckArg.isNotNull(workspace, "workspace"); //$NON-NLS-1$ + CheckArg.isNotNull(path, "path"); //$NON-NLS-1$ + CheckArg.isNotNull(file, "file"); //$NON-NLS-1$ + Server server = workspace.getServer(); if (isRegistered(server)) { - return this.delegate.publish(workspace, path, file); + return this.delegate.publish(workspace, path, file, version); } // server must be registered in order to publish @@ -513,7 +532,7 @@ * @return <code>true</code> if listener was removed */ public boolean removeRegistryListener( IServerRegistryListener listener ) { - CheckArg.isNotNull(listener, "listener"); + CheckArg.isNotNull(listener, "listener"); //$NON-NLS-1$ return this.listeners.remove(listener); } @@ -522,7 +541,7 @@ * @return a status indicating if the specified server was removed from the registry (never <code>null</code>) */ public Status removeServer( Server server ) { - CheckArg.isNotNull(server, "server"); + CheckArg.isNotNull(server, "server"); //$NON-NLS-1$ return internalRemoveServer(server, true); } @@ -551,7 +570,7 @@ Node userNode = attributeMap.getNamedItem(USER_TAG); Node passwordNode = attributeMap.getNamedItem(PASSWORD_TAG); String pswd = ((passwordNode == null) ? null : new String(Base64.decode(passwordNode.getNodeValue()), - "UTF-8")); + "UTF-8")); //$NON-NLS-1$ // add server to registry addServer(new PersistedServer(urlNode.getNodeValue(), userNode.getNodeValue(), pswd, (pswd != null))); @@ -599,8 +618,8 @@ StreamResult resultXML = new StreamResult(new FileOutputStream(getStateFileName())); TransformerFactory transFactory = TransformerFactory.newInstance(); Transformer transformer = transFactory.newTransformer(); - transformer.setOutputProperty(OutputKeys.INDENT, "yes"); - transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-am...;, "2"); + transformer.setOutputProperty(OutputKeys.INDENT, "yes"); //$NON-NLS-1$ + transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-am...;, "2"); //$NON-NLS-1$ //$NON-NLS-2$ transformer.transform(source, resultXML); } catch (Exception e) { return new Status(Severity.ERROR, RestClientI18n.errorSavingServerRegistry.text(getStateFileName()), e); @@ -637,9 +656,9 @@ public Status unpublish( Workspace workspace, String path, File file ) { - CheckArg.isNotNull(workspace, "workspace"); - CheckArg.isNotNull(path, "path"); - CheckArg.isNotNull(file, "file"); + CheckArg.isNotNull(workspace, "workspace"); //$NON-NLS-1$ + CheckArg.isNotNull(path, "path"); //$NON-NLS-1$ + CheckArg.isNotNull(file, "file"); //$NON-NLS-1$ Server server = workspace.getServer(); @@ -660,8 +679,8 @@ */ public Status updateServer( Server previousServerVersion, Server newServerVersion ) { - CheckArg.isNotNull(previousServerVersion, "previousServerVersion"); - CheckArg.isNotNull(newServerVersion, "newServerVersion"); + CheckArg.isNotNull(previousServerVersion, "previousServerVersion"); //$NON-NLS-1$ + CheckArg.isNotNull(newServerVersion, "newServerVersion"); //$NON-NLS-1$ Status status = null; @@ -706,18 +725,15 @@ /** * {@inheritDoc} - * <p> - * <strong>This method is unsupported and should not be called.</strong> * - * @throws UnsupportedOperationException if this method is called * @see org.modeshape.web.jcr.rest.client.IRestClient#query(org.modeshape.web.jcr.rest.client.domain.Workspace, * java.lang.String, java.lang.String) */ @Override - public List<QueryRow> query( Workspace arg0, - String arg1, - String arg2 ) throws Exception { - throw new UnsupportedOperationException(); + public List<QueryRow> query( Workspace workspace, + String language, + String statement ) throws Exception { + return this.delegate.query(workspace, language, statement); } /** @@ -730,11 +746,11 @@ * java.lang.String, java.lang.String, int, int) */ @Override - public List<QueryRow> query( Workspace arg0, - String arg1, - String arg2, - int arg3, - int arg4 ) throws Exception { + public List<QueryRow> query( Workspace workspace, + String language, + String statement, + int offset, + int limit ) throws Exception { throw new UnsupportedOperationException(); } @@ -748,12 +764,12 @@ * java.lang.String, java.lang.String, int, int, java.util.Map) */ @Override - public List<QueryRow> query( Workspace arg0, - String arg1, - String arg2, - int arg3, - int arg4, - Map<String, String> arg5 ) throws Exception { + public List<QueryRow> query( Workspace workspace, + String language, + String statement, + int offset, + int limit, + Map<String, String> variables ) throws Exception { throw new UnsupportedOperationException(); } Added: branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/WorkspaceArea.java =================================================================== --- branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/WorkspaceArea.java (rev 0) +++ branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/WorkspaceArea.java 2011-04-04 14:26:19 UTC (rev 30268) @@ -0,0 +1,63 @@ +package org.jboss.tools.modeshape.rest; + +import org.modeshape.common.util.CheckArg; +import org.modeshape.web.jcr.rest.client.domain.Workspace; + +/** + * The <code>WorkspaceArea</code> represents a known area in a ModeShape repository where sequencing of resources occurs. + */ +public final class WorkspaceArea { + + /** + * The path within the workspace where this area is found (never <code>null</code>). + */ + private final String path; + + /** + * An optional workspace area title (can be <code>null</code> or empty). + */ + private final String title; + + /** + * The workspace where this area is found (never <code>null</code>). + */ + private final Workspace workspace; + + /** + * @param workspace the workspace where this area is found (never <code>null</code>) + * @param path the workspace path where this area is found (never <code>null</code>) + * @param title the workspace area title (can be <code>null</code> or empty) + */ + public WorkspaceArea( Workspace workspace, + String path, + String title ) { + CheckArg.isNotNull(workspace, "workspace"); //$NON-NLS-1$ + CheckArg.isNotEmpty(path, "path"); //$NON-NLS-1$ + + this.workspace = workspace; + this.path = path; + this.title = title; + } + + /** + * @return path the workspace path where this area is found (never <code>null</code>) + */ + public String getPath() { + return this.path; + } + + /** + * @return title the workspace area title (can be <code>null</code> or empty) + */ + public String getTitle() { + return this.title; + } + + /** + * @return workspace the workspace where this area is found (never <code>null</code>) + */ + public Workspace getWorkspace() { + return this.workspace; + } + +} Property changes on: branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/WorkspaceArea.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/jobs/PublishJob.java =================================================================== --- branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/jobs/PublishJob.java 2011-04-04 13:59:30 UTC (rev 30267) +++ branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/jobs/PublishJob.java 2011-04-04 14:26:19 UTC (rev 30268) @@ -13,10 +13,12 @@ import static org.jboss.tools.modeshape.rest.IUiConstants.PLUGIN_ID; import static org.jboss.tools.modeshape.rest.IUiConstants.PUBLISHING_JOB_FAMILY; + import java.io.File; import java.net.URL; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; + import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; @@ -36,10 +38,6 @@ */ public final class PublishJob extends Job { - // =========================================================================================================================== - // Constants - // =========================================================================================================================== - /** * The job type. */ @@ -60,10 +58,6 @@ */ private static final AtomicInteger JOB_ID = new AtomicInteger(); - // =========================================================================================================================== - // Class Methods - // =========================================================================================================================== - /** * @param type the job type (never <code>null</code>) * @param jobId the job identifier @@ -71,7 +65,7 @@ */ private static String getJobName( Type type, int jobId ) { - CheckArg.isNotNull(type, "type"); + CheckArg.isNotNull(type, "type"); //$NON-NLS-1$ if (Type.PUBLISH == type) { return RestClientI18n.publishJobPublishName.text(jobId); @@ -81,10 +75,6 @@ return RestClientI18n.publishJobUnpublishName.text(jobId); } - // =========================================================================================================================== - // Fields - // =========================================================================================================================== - /** * The files being published or unpublished. */ @@ -101,6 +91,11 @@ private final Type type; /** + * Indicates if published resources should be versioned on the ModeShape server. + */ + private final boolean version; + + /** * The workspace to use when publishing or unpublishing. */ private final Workspace workspace; @@ -110,32 +105,31 @@ */ private final String workspaceArea; - // =========================================================================================================================== - // Constructors - // =========================================================================================================================== - /** * @param type the job type (never <code>null</code>) * @param files the files being published or unpublished (never <code>null</code>) * @param workspace the workspace to use when publishing or unpublishing (never <code>null</code>) * @param workspaceArea the path segment prepended to the file project path (maybe be <code>null</code> or empty) + * @param version <true> if published resources should be versioned */ public PublishJob( Type type, List<IFile> files, Workspace workspace, - String workspaceArea ) { + String workspaceArea, + boolean version ) { super(getJobName(type, JOB_ID.incrementAndGet())); - CheckArg.isNotNull(files, "files"); - CheckArg.isNotNull(workspace, "workspace"); + CheckArg.isNotNull(files, "files"); //$NON-NLS-1$ + CheckArg.isNotNull(workspace, "workspace"); //$NON-NLS-1$ this.type = type; this.files = files; this.workspace = workspace; + this.version = version; this.jobId = JOB_ID.get(); // setup the workspace area and remove trailing separator if necessary - String temp = ((workspaceArea == null) ? "" : workspaceArea); + String temp = ((workspaceArea == null) ? "" : workspaceArea); //$NON-NLS-1$ if (temp.endsWith(File.separator)) { this.workspaceArea = temp.substring(0, (temp.length() - 1)); @@ -146,10 +140,6 @@ setUser(true); // allow user to run in background } - // =========================================================================================================================== - // Methods - // =========================================================================================================================== - /** * {@inheritDoc} * @@ -227,7 +217,7 @@ Status status = null; if (isPublishing()) { - status = getServerManager().publish(this.workspace, path, file); + status = getServerManager().publish(this.workspace, path, file, this.version); // set persistent property on resource indicating it has been published if (!status.isError()) { Modified: branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/log/EclipseLogger.java =================================================================== --- branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/log/EclipseLogger.java 2011-04-04 13:59:30 UTC (rev 30267) +++ branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/log/EclipseLogger.java 2011-04-04 14:26:19 UTC (rev 30268) @@ -12,6 +12,7 @@ package org.jboss.tools.modeshape.rest.log; import java.text.MessageFormat; + import org.eclipse.core.runtime.ILog; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Platform; @@ -25,30 +26,14 @@ */ public final class EclipseLogger implements Logger { - // =========================================================================================================================== - // Class Fields - // =========================================================================================================================== - private static ILog LOGGER = Platform.getLog(Platform.getBundle(IUiConstants.PLUGIN_ID)); - // =========================================================================================================================== - // Fields - // =========================================================================================================================== - private String name; - // =========================================================================================================================== - // Constructors - // =========================================================================================================================== - EclipseLogger( String name ) { this.name = name; } - // =========================================================================================================================== - // Methods - // =========================================================================================================================== - /** * {@inheritDoc} * @@ -417,7 +402,7 @@ */ @Override public boolean isDebugEnabled() { - return false; + return true; } /** @@ -437,7 +422,7 @@ */ @Override public boolean isErrorEnabled() { - return false; + return true; } /** @@ -457,7 +442,7 @@ */ @Override public boolean isInfoEnabled() { - return false; + return true; } /** @@ -477,7 +462,7 @@ */ @Override public boolean isTraceEnabled() { - return false; + return true; } /** @@ -497,7 +482,7 @@ */ @Override public boolean isWarnEnabled() { - return false; + return true; } /** Deleted: branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/log/StaticLoggerBinder.java =================================================================== --- branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/log/StaticLoggerBinder.java 2011-04-04 13:59:30 UTC (rev 30267) +++ branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/log/StaticLoggerBinder.java 2011-04-04 14:26:19 UTC (rev 30268) @@ -1,77 +0,0 @@ -/* - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. - * - * This software is made available by Red Hat, Inc. under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution and is - * available at http://www.eclipse.org/legal/epl-v10.html. - * - * See the AUTHORS.txt file in the distribution for a full listing of - * individual contributors. - */ -package org.jboss.tools.modeshape.rest.log; - -import org.slf4j.ILoggerFactory; -import org.slf4j.spi.LoggerFactoryBinder; - -public final class StaticLoggerBinder implements LoggerFactoryBinder { - - // =========================================================================================================================== - // Class Fields - // =========================================================================================================================== - - /** - * The class name of the logger factory. - */ - private static final String LOGGER_FACTORY_CLASS_NAME = EclipseLoggerFactory.class.getName(); - - /** - * The unique instance of this class. - */ - private static final StaticLoggerBinder SINGLETON = new StaticLoggerBinder(); - - // =========================================================================================================================== - // Class Methods - // =========================================================================================================================== - - /** - * @return the static instance of the logger - */ - public static final StaticLoggerBinder getSingleton() { - return SINGLETON; - } - - // =========================================================================================================================== - // Fields - // =========================================================================================================================== - - /** - * The logger factory used. - */ - private final ILoggerFactory loggerFactory = new EclipseLoggerFactory(); - - // =========================================================================================================================== - // Methods - // =========================================================================================================================== - - /** - * {@inheritDoc} - * - * @see org.slf4j.spi.LoggerFactoryBinder#getLoggerFactory() - */ - @Override - public ILoggerFactory getLoggerFactory() { - return this.loggerFactory; - } - - /** - * {@inheritDoc} - * - * @see org.slf4j.spi.LoggerFactoryBinder#getLoggerFactoryClassStr() - */ - @Override - public String getLoggerFactoryClassStr() { - return LOGGER_FACTORY_CLASS_NAME; - } - -} Added: branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/preferences/FileFiltersPreferencePage.java =================================================================== --- branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/preferences/FileFiltersPreferencePage.java (rev 0) +++ branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/preferences/FileFiltersPreferencePage.java 2011-04-04 14:26:19 UTC (rev 30268) @@ -0,0 +1,180 @@ +/* + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. + * + * This software is made available by Red Hat, Inc. under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution and is + * available at http://www.eclipse.org/legal/epl-v10.html. + * + * See the AUTHORS.txt file in the distribution for a full listing of + * individual contributors. + */ +package org.jboss.tools.modeshape.rest.preferences; + +import static org.jboss.tools.modeshape.rest.IUiConstants.ModeShape_IMAGE_16x; +import static org.jboss.tools.modeshape.rest.IUiConstants.HelpContexts.PREFERENCE_PAGE_HELP_CONTEXT; +import static org.jboss.tools.modeshape.rest.RestClientI18n.fileFiltersPreferencePageDescription; +import static org.jboss.tools.modeshape.rest.RestClientI18n.fileFiltersPreferencePageMessage; +import static org.jboss.tools.modeshape.rest.RestClientI18n.fileFiltersPreferencePageTitle; + +import org.eclipse.jface.preference.IPreferenceStore; +import org.eclipse.jface.preference.PreferencePage; +import org.eclipse.swt.SWT; +import org.eclipse.swt.graphics.Image; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.ui.IWorkbench; +import org.eclipse.ui.IWorkbenchPreferencePage; +import org.eclipse.ui.help.IWorkbenchHelpSystem; +import org.jboss.tools.modeshape.rest.Activator; + +/** + * The <code>FileFiltersPreferencePage</code> is the UI for managing all file extension and folder name filter preferences. + */ +public final class FileFiltersPreferencePage extends PreferencePage implements IWorkbenchPreferencePage { + + /** + * The editor used to manage the list of filtered file extensions. + */ + private FilteredFileExtensionEditor extensionsEditor; + + /** + * The editor used to manage the list of filtered folder names. + */ + private FilteredFoldersEditor foldersEditor; + + /** + * {@inheritDoc} + * + * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite) + */ + @Override + protected Control createContents( Composite parent ) { + Composite panel = new Composite(parent, SWT.NONE); + panel.setLayout(new GridLayout(2, false)); + panel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); + + // create the filtered extensions editor + this.extensionsEditor = new FilteredFileExtensionEditor(panel); + this.extensionsEditor.setPreferenceStore(getPreferenceStore()); + this.extensionsEditor.getListControl(panel).setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); + + // populate the extensions editor + this.extensionsEditor.load(); + + // create the filtered folders editor + this.foldersEditor = new FilteredFoldersEditor(panel); + this.foldersEditor.setPreferenceStore(getPreferenceStore()); + this.foldersEditor.getListControl(panel).setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); + + // populate the folders editor + this.foldersEditor.load(); + + // register with the help system + IWorkbenchHelpSystem helpSystem = Activator.getDefault().getWorkbench().getHelpSystem(); + helpSystem.setHelp(panel, PREFERENCE_PAGE_HELP_CONTEXT); + + return panel; + } + + /** + * {@inheritDoc} + * + * @see org.eclipse.jface.dialogs.DialogPage#getDescription() + */ + @Override + public String getDescription() { + return fileFiltersPreferencePageDescription.text(); + } + + /** + * {@inheritDoc} + * + * @see org.eclipse.jface.dialogs.DialogPage#getImage() + */ + @Override + public Image getImage() { + return Activator.getDefault().getImage(ModeShape_IMAGE_16x); + } + + /** + * {@inheritDoc} + * + * @see org.eclipse.jface.dialogs.DialogPage#getMessage() + */ + @Override + public String getMessage() { + return fileFiltersPreferencePageMessage.text(); + } + + /** + * {@inheritDoc} + * + * @see org.eclipse.jface.preference.PreferencePage#getPreferenceStore() + */ + @Override + public IPreferenceStore getPreferenceStore() { + return PrefUtils.getPreferenceStore(); + } + + /** + * {@inheritDoc} + * + * @see org.eclipse.jface.dialogs.DialogPage#getTitle() + */ + @Override + public String getTitle() { + return fileFiltersPreferencePageTitle.text(); + } + + /** + * {@inheritDoc} + * + * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench) + */ + @Override + public void init( IWorkbench workbench ) { + // nothing to do + } + + /** + * {@inheritDoc} + * + * @see org.eclipse.jface.preference.PreferencePage#performDefaults() + */ + @Override + protected void performDefaults() { + this.extensionsEditor.loadDefault(); + this.foldersEditor.loadDefault(); + super.performDefaults(); + } + + /** + * {@inheritDoc} + * + * @see org.eclipse.jface.preference.PreferencePage#performOk() + */ + @Override + public boolean performOk() { + this.extensionsEditor.store(); + this.foldersEditor.store(); + return super.performOk(); + } + + /** + * {@inheritDoc} + * + * @see org.eclipse.jface.dialogs.DialogPage#setVisible(boolean) + */ + @Override + public void setVisible( boolean visible ) { + super.setVisible(visible); + + if (visible) { + this.extensionsEditor.setFocus(); + } + } + +} Property changes on: branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/preferences/FileFiltersPreferencePage.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/preferences/FilteredFileExtensionEditor.java =================================================================== --- branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/preferences/FilteredFileExtensionEditor.java 2011-04-04 13:59:30 UTC (rev 30267) +++ branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/preferences/FilteredFileExtensionEditor.java 2011-04-04 14:26:19 UTC (rev 30268) @@ -11,17 +11,11 @@ */ package org.jboss.tools.modeshape.rest.preferences; -import static org.jboss.tools.modeshape.rest.IUiConstants.FILTERED_FILE_EXTENSIONS_PREFERENCE; +import static org.jboss.tools.modeshape.rest.IUiConstants.Preferences.FILTERED_FILE_EXTENSIONS_PREFERENCE; +import static org.jboss.tools.modeshape.rest.RestClientI18n.fileFiltersPreferencePageFilteredFileExtensionsLabel; import static org.jboss.tools.modeshape.rest.RestClientI18n.newFilteredFileExtensionDialogLabel; import static org.jboss.tools.modeshape.rest.RestClientI18n.newFilteredFileExtensionDialogTitle; -import static org.jboss.tools.modeshape.rest.RestClientI18n.preferencePageFilteredFileExtensionsLabel; -import static org.jboss.tools.modeshape.rest.preferences.PrefUtils.FILE_EXT_DELIMITER; -import static org.jboss.tools.modeshape.rest.preferences.PrefUtils.FILE_EXT_INVALID_CHARS; -import java.util.Arrays; -import java.util.Set; -import java.util.TreeSet; -import org.eclipse.jface.preference.ListEditor; -import org.eclipse.jface.window.Window; + import org.eclipse.swt.events.VerifyEvent; import org.eclipse.swt.events.VerifyListener; import org.eclipse.swt.widgets.Composite; @@ -30,33 +24,21 @@ /** * The <code>FilteredFileExtensionEditor</code> is an editor for managing a set of filtered file extensions. */ -public final class FilteredFileExtensionEditor extends ListEditor implements VerifyListener { - - // ======================================================================================================================= - // Fields - // ======================================================================================================================= - +public final class FilteredFileExtensionEditor extends SortedListEditor implements VerifyListener { + /** - * The current set of file extensions. + * The filter that removes resources, with specific file extensions, from publishing operations (never <code>null</code>). */ - private final Set<String> extensions; + private final PublishingFileFilter filter; - // ======================================================================================================================= - // Constructors - // ======================================================================================================================= - /** * @param parent the parent control */ public FilteredFileExtensionEditor( Composite parent ) { - super(FILTERED_FILE_EXTENSIONS_PREFERENCE, preferencePageFilteredFileExtensionsLabel.text(), parent); - this.extensions = new TreeSet<String>(); + super(FILTERED_FILE_EXTENSIONS_PREFERENCE, fileFiltersPreferencePageFilteredFileExtensionsLabel.text(), parent); + this.filter = new PublishingFileFilter(); } - // ======================================================================================================================= - // Methods - // ======================================================================================================================= - /** * {@inheritDoc} * @@ -64,31 +46,27 @@ */ @Override protected String createList( String[] items ) { - return Utils.combineTokens(items, FILE_EXT_DELIMITER); + return Utils.combineTokens(items, this.filter.getFileExtensionDelimiter()); } /** * {@inheritDoc} * - * @see org.eclipse.jface.preference.ListEditor#getNewInputObject() + * @see org.jboss.tools.modeshape.rest.preferences.SortedListEditor#getNewItemDialogLabel() */ @Override - protected String getNewInputObject() { - NewItemDialog dialog = new NewItemDialog(getShell(), newFilteredFileExtensionDialogTitle.text(), - newFilteredFileExtensionDialogLabel.text(), this); + protected String getNewItemDialogLabel() { + return newFilteredFileExtensionDialogLabel.text(); + } - if (dialog.open() == Window.OK) { - String extension = dialog.getNewItem(); - - // add new extension - if (extension != null) { - this.extensions.add(extension); - return extension; - } - } - - // user canceled dialog - return null; + /** + * {@inheritDoc} + * + * @see org.jboss.tools.modeshape.rest.preferences.SortedListEditor#getNewItemDialogTitle() + */ + @Override + protected String getNewItemDialogTitle() { + return newFilteredFileExtensionDialogTitle.text(); } /** @@ -98,12 +76,7 @@ */ @Override protected String[] parseString( String stringList ) { - String[] values = Utils.getTokens(stringList, Character.toString(FILE_EXT_DELIMITER), true); - - this.extensions.clear(); - this.extensions.addAll(Arrays.asList(values)); - - return values; + return Utils.getTokens(stringList, Character.toString(this.filter.getFileExtensionDelimiter()), true); } /** @@ -113,7 +86,7 @@ */ @Override public void verifyText( VerifyEvent event ) { - for (char c : FILE_EXT_INVALID_CHARS.toCharArray()) { + for (char c : this.filter.getFileExtensionInvalidCharacters().toCharArray()) { if (c == event.character) { event.doit = false; break; Modified: branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/preferences/FilteredFoldersEditor.java =================================================================== --- branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/preferences/FilteredFoldersEditor.java 2011-04-04 13:59:30 UTC (rev 30267) +++ branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/preferences/FilteredFoldersEditor.java 2011-04-04 14:26:19 UTC (rev 30268) @@ -11,17 +11,11 @@ */ package org.jboss.tools.modeshape.rest.preferences; -import static org.jboss.tools.modeshape.rest.IUiConstants.FILTERED_FOLDER_NAMES_PREFERENCE; +import static org.jboss.tools.modeshape.rest.IUiConstants.Preferences.FILTERED_FOLDER_NAMES_PREFERENCE; +import static org.jboss.tools.modeshape.rest.RestClientI18n.fileFiltersPreferencePageFilteredFolderNamesLabel; import static org.jboss.tools.modeshape.rest.RestClientI18n.newFilteredFolderNameDialogLabel; import static org.jboss.tools.modeshape.rest.RestClientI18n.newFilteredFolderNameDialogTitle; -import static org.jboss.tools.modeshape.rest.RestClientI18n.preferencePageFilteredFolderNamesLabel; -import static org.jboss.tools.modeshape.rest.preferences.PrefUtils.FOLDER_NAME_DELIMITER; -import static org.jboss.tools.modeshape.rest.preferences.PrefUtils.FOLDER_NAME_INVALID_CHARS; -import java.util.Arrays; -import java.util.Set; -import java.util.TreeSet; -import org.eclipse.jface.preference.ListEditor; -import org.eclipse.jface.window.Window; + import org.eclipse.swt.events.VerifyEvent; import org.eclipse.swt.events.VerifyListener; import org.eclipse.swt.widgets.Composite; @@ -30,33 +24,21 @@ /** * The <code>FilteredFoldersEditor</code> is an editor for managing a set of folder names. */ -public final class FilteredFoldersEditor extends ListEditor implements VerifyListener { +public final class FilteredFoldersEditor extends SortedListEditor implements VerifyListener { - // ======================================================================================================================= - // Fields - // ======================================================================================================================= - /** - * The current set of folder names. + * The filter that removes resources, contained in specific folders, from publishing operations (never <code>null</code>). */ - private final Set<String> folderNames; + private final PublishingFileFilter filter; - // ======================================================================================================================= - // Constructors - // ======================================================================================================================= - /** * @param parent the parent control */ public FilteredFoldersEditor( Composite parent ) { - super(FILTERED_FOLDER_NAMES_PREFERENCE, preferencePageFilteredFolderNamesLabel.text(), parent); - this.folderNames = new TreeSet<String>(); + super(FILTERED_FOLDER_NAMES_PREFERENCE, fileFiltersPreferencePageFilteredFolderNamesLabel.text(), parent); + this.filter = new PublishingFileFilter(); } - // ======================================================================================================================= - // Methods - // ======================================================================================================================= - /** * {@inheritDoc} * @@ -64,31 +46,27 @@ */ @Override protected String createList( String[] items ) { - return Utils.combineTokens(items, FOLDER_NAME_DELIMITER); + return Utils.combineTokens(items, this.filter.getFolderNameDelimiter()); } /** * {@inheritDoc} * - * @see org.eclipse.jface.preference.ListEditor#getNewInputObject() + * @see org.jboss.tools.modeshape.rest.preferences.SortedListEditor#getNewItemDialogLabel() */ @Override - protected String getNewInputObject() { - NewItemDialog dialog = new NewItemDialog(getShell(), newFilteredFolderNameDialogTitle.text(), - newFilteredFolderNameDialogLabel.text(), this); + protected String getNewItemDialogLabel() { + return newFilteredFolderNameDialogLabel.text(); + } - if (dialog.open() == Window.OK) { - String folderName = dialog.getNewItem(); - - // add new folder name - if (folderName != null) { - this.folderNames.add(folderName); - return folderName; - } - } - - // user canceled dialog - return null; + /** + * {@inheritDoc} + * + * @see org.jboss.tools.modeshape.rest.preferences.SortedListEditor#getNewItemDialogTitle() + */ + @Override + protected String getNewItemDialogTitle() { + return newFilteredFolderNameDialogTitle.text(); } /** @@ -98,12 +76,7 @@ */ @Override protected String[] parseString( String stringList ) { - String[] values = Utils.getTokens(stringList, Character.toString(FOLDER_NAME_DELIMITER), true); - - this.folderNames.clear(); - this.folderNames.addAll(Arrays.asList(values)); - - return values; + return Utils.getTokens(stringList, Character.toString(this.filter.getFolderNameDelimiter()), true); } /** @@ -113,7 +86,7 @@ */ @Override public void verifyText( VerifyEvent event ) { - for (char c : FOLDER_NAME_INVALID_CHARS.toCharArray()) { + for (char c : this.filter.getFolderNameInvalidCharacters().toCharArray()) { if (c == event.character) { event.doit = false; break; Modified: branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/preferences/ModeShapePreferencePage.java =================================================================== --- branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/preferences/ModeShapePreferencePage.java 2011-04-04 13:59:30 UTC (rev 30267) +++ branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/preferences/ModeShapePreferencePage.java 2011-04-04 14:26:19 UTC (rev 30268) @@ -12,10 +12,15 @@ package org.jboss.tools.modeshape.rest.preferences; import static org.jboss.tools.modeshape.rest.IUiConstants.ModeShape_IMAGE_16x; -import static org.jboss.tools.modeshape.rest.IUiConstants.PREFERENCE_PAGE_HELP_CONTEXT; +import static org.jboss.tools.modeshape.rest.IUiConstants.HelpContexts.PREFERENCE_PAGE_HELP_CONTEXT; +import static org.jboss.tools.modeshape.rest.IUiConstants.Preferences.ENABLE_RESOURCE_VERSIONING; import static org.jboss.tools.modeshape.rest.RestClientI18n.preferencePageDescription; +import static org.jboss.tools.modeshape.rest.RestClientI18n.preferencePageEnableVersioningEditor; +import static org.jboss.tools.modeshape.rest.RestClientI18n.preferencePageEnableVersioningEditorToolTip; import static org.jboss.tools.modeshape.rest.RestClientI18n.preferencePageMessage; import static org.jboss.tools.modeshape.rest.RestClientI18n.preferencePageTitle; + +import org.eclipse.jface.preference.BooleanFieldEditor; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.preference.PreferencePage; import org.eclipse.swt.SWT; @@ -30,29 +35,16 @@ import org.jboss.tools.modeshape.rest.Activator; /** - * The <code>ModeShapePreferencePage</code> is the UI for managing all ModeShape-related preferences. + * The <code>ModeShapePreferencePage</code> is the UI for managing general ModeShape-related preferences. */ public final class ModeShapePreferencePage extends PreferencePage implements IWorkbenchPreferencePage { - // =========================================================================================================================== - // Fields - // =========================================================================================================================== - /** - * The editor used to manage the list of filtered file extensions. + * The editor used to enable and disable versioning in ModeShape. */ - private FilteredFileExtensionEditor extensionsEditor; + private BooleanFieldEditor enableVersioningEditor; /** - * The editor used to manage the list of filtered folder names. - */ - private FilteredFoldersEditor foldersEditor; - - // =========================================================================================================================== - // Methods - // =========================================================================================================================== - - /** * {@inheritDoc} * * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite) @@ -63,22 +55,16 @@ panel.setLayout(new GridLayout(2, false)); panel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); - // create the filtered extensions editor - this.extensionsEditor = new FilteredFileExtensionEditor(panel); - this.extensionsEditor.setPreferenceStore(getPreferenceStore()); - this.extensionsEditor.getListControl(panel).setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); + // create the field editor + this.enableVersioningEditor = new BooleanFieldEditor(ENABLE_RESOURCE_VERSIONING, + preferencePageEnableVersioningEditor.text(), + panel); + this.enableVersioningEditor.setPreferenceStore(getPreferenceStore()); + this.enableVersioningEditor.getDescriptionControl(panel).setToolTipText(preferencePageEnableVersioningEditorToolTip.text()); - // populate the extensions editor - this.extensionsEditor.load(); + // populate the editor with current preference value + this.enableVersioningEditor.load(); - // create the filtered folders editor - this.foldersEditor = new FilteredFoldersEditor(panel); - this.foldersEditor.setPreferenceStore(getPreferenceStore()); - this.foldersEditor.getListControl(panel).setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); - - // populate the folders editor - this.foldersEditor.load(); - // register with the help system IWorkbenchHelpSystem helpSystem = Activator.getDefault().getWorkbench().getHelpSystem(); helpSystem.setHelp(panel, PREFERENCE_PAGE_HELP_CONTEXT); @@ -153,8 +139,7 @@ */ @Override protected void performDefaults() { - this.extensionsEditor.loadDefault(); - this.foldersEditor.loadDefault(); + this.enableVersioningEditor.loadDefault(); super.performDefaults(); } @@ -165,9 +150,22 @@ */ @Override public boolean performOk() { - this.extensionsEditor.store(); - this.foldersEditor.store(); + this.enableVersioningEditor.store(); return super.performOk(); } + + /** + * {@inheritDoc} + * + * @see org.eclipse.jface.dialogs.DialogPage#setVisible(boolean) + */ + @Override + public void setVisible( boolean visible ) { + super.setVisible(visible); + + if (visible) { + this.enableVersioningEditor.setFocus(); + } + } } Deleted: branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/preferences/NewItemDialog.java =================================================================== --- branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/preferences/NewItemDialog.java 2011-04-04 13:59:30 UTC (rev 30267) +++ branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/preferences/NewItemDialog.java 2011-04-04 14:26:19 UTC (rev 30268) @@ -1,190 +0,0 @@ -/* - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. - * - * This software is made available by Red Hat, Inc. under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution and is - * available at http://www.eclipse.org/legal/epl-v10.html. - * - * See the AUTHORS.txt file in the distribution for a full listing of - * individual contributors. - */ -package org.jboss.tools.modeshape.rest.preferences; - -import org.eclipse.jface.dialogs.Dialog; -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.ModifyEvent; -import org.eclipse.swt.events.ModifyListener; -import org.eclipse.swt.events.VerifyListener; -import org.eclipse.swt.graphics.Rectangle; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.swt.widgets.Text; -import org.modeshape.common.util.CheckArg; - -/** - * A <code>NewItemDialog</code> allows the user to enter a new file extension or new folder name that they wish to be filtered out - * of all publishing operations. - */ -public final class NewItemDialog extends Dialog implements ModifyListener { - - // ======================================================================================================================= - // Fields - // ======================================================================================================================= - - /** - * The label describing the new item. - */ - private final String label; - - /** - * The contents of the new item text field. - */ - private String newItem; - - /** - * The dialog title. - */ - private final String title; - - /** - * The listener verifying input characters. - */ - private final VerifyListener verifyListener; - - // ======================================================================================================================= - // Constructors - // ======================================================================================================================= - - /** - * @param parentShell the parent shell (may be <code>null</code>) - * @param title the localized dialog title (never <code>null</code>) - * @param label the localized label (never <code>null</code>) - * @param verifyListener a listener that validates input characters (may be <code>null</code>) - */ - public NewItemDialog( Shell parentShell, - String title, - String label, - VerifyListener verifyListener ) { - super(parentShell); - - CheckArg.isNotNull(title, "title"); - CheckArg.isNotNull(label, "label"); - - this.title = title; - this.label = label; - this.verifyListener = verifyListener; - - setShellStyle(getShellStyle() | SWT.RESIZE); - } - - // ======================================================================================================================= - // Methods - // ======================================================================================================================= - - /** - * {@inheritDoc} - * - * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell) - */ - @Override - protected void configureShell( Shell newShell ) { - newShell.setText(this.title); - super.configureShell(newShell); - } - - /** - * {@inheritDoc} - * - * @see org.eclipse.jface.dialogs.Dialog#createButton(org.eclipse.swt.widgets.Composite, int, java.lang.String, boolean) - */ - @Override - protected Button createButton( Composite parent, - int id, - String label, - boolean defaultButton ) { - Button button = super.createButton(parent, id, label, defaultButton); - - // disable OK button initially - if (id == OK) { - button.setEnabled(false); - } - - return button; - } - - /** - * {@inheritDoc} - * - * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite) - */ - @Override - protected Control createDialogArea( Composite parent ) { - Composite panel = (Composite)super.createDialogArea(parent); - Composite pnlEditor = new Composite(panel, SWT.NONE); - pnlEditor.setLayout(new GridLayout(2, false)); - pnlEditor.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); - - Label label = new Label(pnlEditor, SWT.NONE); - label.setText(this.label); - - Text textField = new Text(pnlEditor, SWT.BORDER); - textField.setLayoutData(new GridData(SWT.FILL, SWT.NONE, true, false)); - textField.addModifyListener(this); - - // add listener if necessary - if (this.verifyListener != null) { - textField.addVerifyListener(this.verifyListener); - } - - return panel; - } - - /** - * @return the new item or <code>null</code> if the dialog was canceled - */ - public String getNewItem() { - if (getReturnCode() == OK) { - return this.newItem; - } - - return null; - } - - /** - * {@inheritDoc} - * - * @see org.eclipse.jface.dialogs.Dialog#initializeBounds() - */ - @Override - protected void initializeBounds() { - super.initializeBounds(); - - // resize shell to be twice the width needed for the title (without this the title maybe cropped) - int width = (2 * convertWidthInCharsToPixels(this.title.length())); - Rectangle rectangle = getShell().getBounds(); - getShell().setBounds(rectangle.x, rectangle.y, width, rectangle.height); - } - - /** - * {@inheritDoc} - * - * @see org.eclipse.swt.events.ModifyListener#modifyText(org.eclipse.swt.events.ModifyEvent) - */ - @Override - public void modifyText( ModifyEvent event ) { - // disable OK button if text field does not have any characters - this.newItem = ((Text)event.widget).getText(); - boolean enable = (this.newItem.length() != 0); - - if (getButton(OK).getEnabled() != enable) { - getButton(OK).setEnabled(enable); - } - } - -} Modified: branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/preferences/PrefUtils.java =================================================================== --- branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/preferences/PrefUtils.java 2011-04-04 13:59:30 UTC (rev 30267) +++ branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/preferences/PrefUtils.java 2011-04-04 14:26:19 UTC (rev 30268) @@ -11,18 +11,10 @@ */ package org.jboss.tools.modeshape.rest.preferences; -import static org.jboss.tools.modeshape.rest.IUiConstants.FILTERED_FILE_EXTENSIONS_PREFERENCE; -import static org.jboss.tools.modeshape.rest.IUiConstants.FILTERED_FOLDER_NAMES_PREFERENCE; -import static org.jboss.tools.modeshape.rest.RestClientI18n.prefUtilsPropertyFileNotFound; -import static org.jboss.tools.modeshape.rest.RestClientI18n.prefUtilsPropertyNotFound; -import java.io.InputStream; -import java.util.Properties; import org.eclipse.jface.preference.IPreferenceStore; import org.jboss.tools.modeshape.rest.Activator; import org.jboss.tools.modeshape.rest.Utils; import org.modeshape.common.util.CheckArg; -import org.modeshape.web.jcr.rest.client.Status; -import org.modeshape.web.jcr.rest.client.Status.Severity; /** * The <code>PrefUtils</code> class provides common utilities relating to preferences. This class assumes the Eclipse runtime @@ -30,155 +22,7 @@ */ public final class PrefUtils { - // ======================================================================================================================= - // Constants - // ======================================================================================================================= - /** - * The name of the properties file located in this package. - */ - private static final String PREFERENCES_FILE = "prefs.properties"; - - /** - * The preference name for the delimiter that separates filtered file extensions when the preference value is stored. - */ - private static final String FILE_EXT_DELIMITER_PREF_NAME = "fileExtension.delimiter"; - - /** - * The delimiter that separates filtered file extensions when the preference value is stored. - */ - public static final char FILE_EXT_DELIMITER; - - /** - * The preference name for characters that are <strong>NOT</strong> allowed to appear in a file extension. - */ - private static final String FILE_EXT_INVALID_CHARS_PREF_NAME = "fileExtension.invalidChars"; - - /** - * The characters that are <strong>NOT</strong> allowed to appear in a file extension. - */ - public static final String FILE_EXT_INVALID_CHARS; - - /** - * The preference name for the delimiter that separates filtered folder names when the preference value is stored. - */ - private static final String FOLDER_NAME_DELIMITER_PREF_NAME = "folderName.delimiter"; - - /** - * The delimiter that separates filtered folder names when the preference value is stored. - */ - public static final char FOLDER_NAME_DELIMITER; - - /** - * The preference name for characters that are <strong>NOT</strong> allowed to appear in a folder name. - */ - private static final String FOLDER_NAME_INVALID_CHARS_PREF_NAME = "folderName.invalidChars"; - - /** - * The characters that are <strong>NOT</strong> allowed to appear in a folder name. - */ - public static final String FOLDER_NAME_INVALID_CHARS; - - // ======================================================================================================================= - // Class Initializer - // ======================================================================================================================= - - static { - InputStream is = null; - Properties preferenceProperties = new Properties(); - - // get the properties file - try { - is = PrefUtils.class.getResourceAsStream(PREFERENCES_FILE); - } catch (Exception e) { - Activator.getDefault().log(new Status(Severity.ERROR, e.getMessage(), e)); - } - - if (is == null) { - Activator.getDefault().log(new Status(Severity.ERROR, prefUtilsPropertyFileNotFound.text(), null)); - } else { - // load the properties file - try { - preferenceProperties.load(is); - } catch (Exception e) { - Activator.getDefault().log(new Status(Severity.ERROR, e.getMessage(), e)); - } finally { - try { - is.close(); - } catch (Exception e) { - Activator.getDefault().log(new Status(Severity.ERROR, e.getMessage(), e)); - } - } - } - - // file extensions delimiter - String temp = preferenceProperties.getProperty(FILE_EXT_DELIMITER_PREF_NAME); - - if ((temp != null) && (temp.length() > 0)) { - FILE_EXT_DELIMITER = temp.charAt(0); - } else { - // make sure preference has a value - FILE_EXT_DELIMITER = ','; - Activator.getDefault().log(new Status(Severity.ERROR, prefUtilsPropertyNotFound.text(FILE_EXT_DELIMITER_PREF_NAME), - null)); - } - - // file extension invalid characters - temp = preferenceProperties.getProperty(FILE_EXT_INVALID_CHARS_PREF_NAME); - - if ((temp != null) && (temp.length() > 0)) { - FILE_EXT_INVALID_CHARS = temp; - } else { - // make sure preference has a value - FILE_EXT_INVALID_CHARS = "*?<>|/\\:;."; - Activator.getDefault().log(new Status(Severity.ERROR, - prefUtilsPropertyNotFound.text(FILE_EXT_INVALID_CHARS_PREF_NAME), null)); - } - - // folder names delimiter - temp = preferenceProperties.getProperty(FOLDER_NAME_DELIMITER_PREF_NAME); - - if ((temp != null) && (temp.length() > 0)) { - FOLDER_NAME_DELIMITER = temp.charAt(0); - } else { - // make sure preference has a value - FOLDER_NAME_DELIMITER = ','; - Activator.getDefault().log(new Status(Severity.ERROR, - prefUtilsPropertyNotFound.text(FOLDER_NAME_DELIMITER_PREF_NAME), null)); - } - - // folder name invalid characters - temp = preferenceProperties.getProperty(FOLDER_NAME_INVALID_CHARS_PREF_NAME); - - if ((temp != null) && (temp.length() > 0)) { - FOLDER_NAME_INVALID_CHARS = temp; - } else { - // make sure preference has a value - FOLDER_NAME_INVALID_CHARS = "*?<>|/\\:;"; - Activator.getDefault().log(new Status(Severity.ERROR, - prefUtilsPropertyNotFound.text(FOLDER_NAME_INVALID_CHARS_PREF_NAME), null)); - } - } - - // ======================================================================================================================= - // Class Methods - // ======================================================================================================================= - - /** - * @return the file extensions being filtered out of publishing operations (never null) - */ - public static String[] getFilteredFileExtensions() { - return getListPropertyValue(FILTERED_FILE_EXTENSIONS_PREFERENCE, FILE_EXT_DELIMITER, true); - } - - /** - * @return the folder names being filtered out of publishing operations (never null) - */ - public static String[] getFilteredFolderNames() { - return getListPropertyValue(FILTERED_FOLDER_NAMES_PREFERENCE, FOLDER_NAME_DELIMITER, true); - } - - /** * @param propertyId the property name whose list values are being requested (never <code>null</code>) * @param delimiter the character separating the items in the property value * @param removeDuplicates a flag indicating if duplicate items should be removed @@ -187,7 +31,7 @@ public static String[] getListPropertyValue( String propertyId, char delimiter, boolean removeDuplicates ) { - CheckArg.isNotNull(propertyId, "propertyId"); + CheckArg.isNotNull(propertyId, "propertyId"); //$NON-NLS-1$ return Utils.getTokens(getPreferenceStore().getString(propertyId), Character.toString(delimiter), removeDuplicates); } @@ -206,15 +50,11 @@ public static void setListPropertyValue( String propertyId, String[] items, char delimiter ) { - CheckArg.isNotNull(propertyId, "propertyId"); - CheckArg.isNotNull(items, "items"); + CheckArg.isNotNull(propertyId, "propertyId"); //$NON-NLS-1$ + CheckArg.isNotNull(items, "items"); //$NON-NLS-1$ getPreferenceStore().setValue(propertyId, Utils.combineTokens(items, delimiter)); } - // ======================================================================================================================= - // Constructors - // ======================================================================================================================= - /** * Don't allow construction. */ Added: branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/preferences/PreferenceInitializer.java =================================================================== --- branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/preferences/PreferenceInitializer.java (rev 0) +++ branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/preferences/PreferenceInitializer.java 2011-04-04 14:26:19 UTC (rev 30268) @@ -0,0 +1,87 @@ +/* + * JBoss, Home of Professional Open Source. + * + * See the LEGAL.txt file distributed with this work for information regarding copyright ownership and licensing. + * + * See the AUTHORS.txt file distributed with this work for a full listing of individual contributors. + */ +package org.jboss.tools.modeshape.rest.preferences; + +import static org.jboss.tools.modeshape.rest.IUiConstants.PLUGIN_ID; +import static org.jboss.tools.modeshape.rest.RestClientI18n.preferenceDefaultScopeNotFound; +import static org.jboss.tools.modeshape.rest.RestClientI18n.preferenceFileNotFound; + +import java.io.IOException; +import java.io.InputStream; +import java.util.Properties; + +import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer; +import org.eclipse.core.runtime.preferences.DefaultScope; +import org.eclipse.core.runtime.preferences.IEclipsePreferences; +import org.jboss.tools.modeshape.rest.Activator; +import org.modeshape.web.jcr.rest.client.Status; +import org.modeshape.web.jcr.rest.client.Status.Severity; + +/** + * + */ +public final class PreferenceInitializer extends AbstractPreferenceInitializer { + + /** + * The name of the preferences default values properties file located in this package. + */ + private static final String PREFERENCES_FILE = "prefs.properties"; //$NON-NLS-1$ + + /** + * The default preference values. + */ + private Properties preferenceDefaults; + + /** + * {@inheritDoc} + * + * @see org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer#initializeDefaultPreferences() + */ + @Override + public void initializeDefaultPreferences() { + IEclipsePreferences defaultValues = new DefaultScope().getNode(PLUGIN_ID); + + if (defaultValues == null) { + // would only happen if PLUGIN_ID is wrong + Activator.getDefault().log(new Status(Severity.ERROR, preferenceDefaultScopeNotFound.text(PLUGIN_ID), null)); + } else { + load(); + + // set default values + for (String property : this.preferenceDefaults.stringPropertyNames()) { + defaultValues.put(property, this.preferenceDefaults.getProperty(property)); + } + } + } + + private void load() { + this.preferenceDefaults = new Properties(); + InputStream input = null; + + try { + input = getClass().getResource(PREFERENCES_FILE).openStream(); + + if (input == null) { + Activator.getDefault().log(new Status(Severity.ERROR, preferenceFileNotFound.text(PREFERENCES_FILE), null)); + } else { + this.preferenceDefaults.load(input); + } + } catch (IOException e) { + Activator.getDefault().log(new Status(Severity.ERROR, preferenceFileNotFound.text(PREFERENCES_FILE), null)); + } finally { + try { + if (input != null) { + input.close(); + } + } catch (IOException e) { + Activator.getDefault().log(new Status(Severity.ERROR, e.getMessage(), e)); + } + } + } + +} Property changes on: branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/preferences/PreferenceInitializer.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/preferences/PublishingFileFilter.java =================================================================== --- branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/preferences/PublishingFileFilter.java 2011-04-04 13:59:30 UTC (rev 30267) +++ branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/preferences/PublishingFileFilter.java 2011-04-04 14:26:19 UTC (rev 30268) @@ -11,58 +11,56 @@ */ package org.jboss.tools.modeshape.rest.preferences; +import static org.jboss.tools.modeshape.rest.IUiConstants.Preferences.FILTERED_FILE_EXTENSIONS_PREFERENCE; +import static org.jboss.tools.modeshape.rest.IUiConstants.Preferences.FILTERED_FOLDER_NAMES_PREFERENCE; +import static org.jboss.tools.modeshape.rest.RestClientI18n.preferenceNotFound; + import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFolder; +import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; +import org.jboss.tools.modeshape.rest.Activator; import org.modeshape.common.util.CheckArg; +import org.modeshape.web.jcr.rest.client.Status; +import org.modeshape.web.jcr.rest.client.Status.Severity; /** * The <code>PublishingFileFilter</code> is a file filter that uses the preferences when filtering files. */ public final class PublishingFileFilter { - // ======================================================================================================================= - // Fields - // ======================================================================================================================= + /** + * The preference name for the delimiter that separates filtered file extensions when the preference value is stored. + */ + private static final String FILE_EXT_DELIMITER_PREF_NAME = "fileExtension.delimiter"; //$NON-NLS-1$ /** - * The file extensions that should not be involved in publishing operations. + * The preference name for characters that are <strong>NOT</strong> allowed to appear in a file extension. */ - private final String[] filteredFileExtensions; + private static final String FILE_EXT_INVALID_CHARS_PREF_NAME = "fileExtension.invalidChars"; //$NON-NLS-1$ /** - * The folder names that should not be involved in publishing operations. + * The preference name for the delimiter that separates filtered folder names when the preference value is stored. */ - private final String[] filteredFolderNames; + private static final String FOLDER_NAME_DELIMITER_PREF_NAME = "folderName.delimiter"; //$NON-NLS-1$ - // ======================================================================================================================= - // Constructors - // ======================================================================================================================= - /** - * Construct a filter using the current preferences. + * The preference name for characters that are <strong>NOT</strong> allowed to appear in a folder name. */ - public PublishingFileFilter() { - this.filteredFileExtensions = PrefUtils.getFilteredFileExtensions(); - this.filteredFolderNames = PrefUtils.getFilteredFolderNames(); - } + private static final String FOLDER_NAME_INVALID_CHARS_PREF_NAME = "folderName.invalidChars"; //$NON-NLS-1$ - // ======================================================================================================================= - // Methods - // ======================================================================================================================= - /** * @param resource the resource being tested (never <code>null</code>) * @return <code>true</code> if the resource should be included (i.e., it is not filtered out) */ public boolean accept( IResource resource ) { - CheckArg.isNotNull(resource, "resource"); + CheckArg.isNotNull(resource, "resource"); //$NON-NLS-1$ - if (resource instanceof IFolder) { + if ((resource instanceof IFolder) || (resource instanceof IProject)) { String name = resource.getName(); // see if folder name has been filtered - for (String filteredName : this.filteredFolderNames) { + for (String filteredName : getFilteredFolderNames()) { if (filteredName.equals(name)) { return false; } @@ -74,7 +72,7 @@ } } else if (resource instanceof IFile) { // see if file extension has been filtered - for (String extension : this.filteredFileExtensions) { + for (String extension : getFilteredFileExtensions()) { if (resource.getFullPath().toString().endsWith('.' + extension)) { return false; } @@ -86,8 +84,98 @@ } } - // must be project return true; } + /** + * The delimiter that separates filtered file extensions when the preference value is stored. + * + * @return the file extension separator character + */ + public char getFileExtensionDelimiter() { + String value = PrefUtils.getPreferenceStore().getDefaultString(FILE_EXT_DELIMITER_PREF_NAME); + + if ((value != null) && (value.length() > 0)) { + return value.charAt(0); + } + + // no value found so log and give a default value + value = ","; //$NON-NLS-1$ + Activator.getDefault().log(new Status(Severity.ERROR, preferenceNotFound.text(FILE_EXT_DELIMITER_PREF_NAME, value), null)); + return value.charAt(0); + } + + /** + * The characters that are <strong>NOT</strong> allowed to appear in a file extension. + * + * @return the invalid file extension characters (never <code>null</code> or empty) + */ + public String getFileExtensionInvalidCharacters() { + String value = PrefUtils.getPreferenceStore().getDefaultString(FILE_EXT_INVALID_CHARS_PREF_NAME); + + if ((value != null) && (value.length() > 0)) { + return value; + } + + // no value found so log and give a default value + value = "*?<>|/\\:;."; //$NON-NLS-1$ + Activator.getDefault().log(new Status(Severity.ERROR, + preferenceNotFound.text(FILE_EXT_INVALID_CHARS_PREF_NAME, value), + null)); + return value; + } + + /** + * @return the file extensions being filtered out of publishing operations (never <code>null</code> but can be empty) + */ + public String[] getFilteredFileExtensions() { + return PrefUtils.getListPropertyValue(FILTERED_FILE_EXTENSIONS_PREFERENCE, getFileExtensionDelimiter(), true); + } + + /** + * @return the folder names being filtered out of publishing operations (never <code>null</code> but can be empty) + */ + public String[] getFilteredFolderNames() { + return PrefUtils.getListPropertyValue(FILTERED_FOLDER_NAMES_PREFERENCE, getFolderNameDelimiter(), true); + } + + /** + * The delimiter that separates filtered folder names when the preference value is stored. + * + * @return the folder name separator character + */ + public char getFolderNameDelimiter() { + String value = PrefUtils.getPreferenceStore().getDefaultString(FOLDER_NAME_DELIMITER_PREF_NAME); + + if ((value != null) && (value.length() > 0)) { + return value.charAt(0); + } + + // no value found so log and give a default value + value = ","; //$NON-NLS-1$ + Activator.getDefault() + .log(new Status(Severity.ERROR, preferenceNotFound.text(FOLDER_NAME_DELIMITER_PREF_NAME, value), null)); + return value.charAt(0); + } + + /** + * The characters that are <strong>NOT</strong> allowed to appear in a folder name (never <code>null</code> but can be empty). + * + * @return the invalid folder name characters (never <code>null</code> or empty) + */ + public String getFolderNameInvalidCharacters() { + String value = PrefUtils.getPreferenceStore().getDefaultString(FOLDER_NAME_INVALID_CHARS_PREF_NAME); + + if ((value != null) && (value.length() > 0)) { + return value; + } + + // no value found so log and give a default value + value = "*?<>|/\\:;"; //$NON-NLS-1$ + Activator.getDefault().log(new Status(Severity.ERROR, + preferenceNotFound.text(FOLDER_NAME_INVALID_CHARS_PREF_NAME, value), + null)); + return value; + } + } Added: branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/preferences/SortedListEditor.java =================================================================== --- branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/preferences/SortedListEditor.java (rev 0) +++ branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/preferences/SortedListEditor.java 2011-04-04 14:26:19 UTC (rev 30268) @@ -0,0 +1,383 @@ +/* + * JBoss, Home of Professional Open Source. + * + * See the LEGAL.txt file distributed with this work for information regarding copyright ownership and licensing. + * + * See the AUTHORS.txt file distributed with this work for a full listing of individual contributors. + */ +package org.jboss.tools.modeshape.rest.preferences; + +import java.util.Arrays; + +import org.eclipse.jface.dialogs.Dialog; +import org.eclipse.jface.preference.ListEditor; +import org.eclipse.jface.window.Window; +import org.eclipse.swt.SWT; +import org.eclipse.swt.custom.CLabel; +import org.eclipse.swt.events.ModifyEvent; +import org.eclipse.swt.events.ModifyListener; +import org.eclipse.swt.events.VerifyListener; +import org.eclipse.swt.graphics.Rectangle; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.swt.widgets.Text; +import org.eclipse.ui.ISharedImages; +import org.jboss.tools.modeshape.rest.Activator; +import org.jboss.tools.modeshape.rest.RestClientI18n; +import org.modeshape.common.util.CheckArg; + +/** + * A preference list string value editor that sorts its entries each time a + * value is added. + */ +public abstract class SortedListEditor extends ListEditor { + + /** + * Indicates if duplicate values are allowed. + */ + private boolean allowDuplicates; + + /** + * The listener verifying input characters. + */ + private VerifyListener verifyListener; + + /** + * Duplicate items are not allowed. + * + * @param name + * the name of the preference this field editor works on + * @param labelText + * the label text of the field editor + * @param parent + * the parent of the field editor's control + */ + public SortedListEditor(String name, String labelText, Composite parent) { + super(name, labelText, parent); + } + + private void disableUpDownButtons() { + // disable up button + Button button = getUpButton(); + + if (button.getEnabled()) { + button.setEnabled(false); + } + + // disable down button + button = getDownButton(); + + if (button.getEnabled()) { + button.setEnabled(false); + } + } + + /** + * {@inheritDoc} + * + * @see org.eclipse.jface.preference.ListEditor#getButtonBoxControl(org.eclipse.swt.widgets.Composite) + */ + @Override + public Composite getButtonBoxControl(Composite parent) { + Composite buttonBox = super.getButtonBoxControl(parent); + getUpButton().setVisible(false); + getDownButton().setVisible(false); + disableUpDownButtons(); + return buttonBox; + } + + /** + * {@inheritDoc} + * + * @see org.eclipse.jface.preference.ListEditor#getNewInputObject() + */ + @Override + protected final String getNewInputObject() { + NewItemDialog dialog = new NewItemDialog(getShell(), getNewItemDialogTitle(), getNewItemDialogLabel(), + this.verifyListener); + if (!this.allowDuplicates) { + dialog.setDisallowedValues(getList().getItems()); + } + + if (dialog.open() == Window.OK) { + String newItem = dialog.getNewItem(); + + // add new item, sort, and update list + if (newItem != null) { + getList().add(newItem); + String[] items = getList().getItems(); + Arrays.sort(items); + getList().setItems(items); + } + } + + // always return null because we have already updated the list + return null; + } + + /** + * {@inheritDoc} + * + * @see org.eclipse.jface.preference.ListEditor#selectionChanged() + */ + @Override + protected void selectionChanged() { + super.selectionChanged(); + disableUpDownButtons(); + } + + /** + * {@inheritDoc} + * + * @see org.eclipse.jface.preference.ListEditor#setEnabled(boolean, + * org.eclipse.swt.widgets.Composite) + */ + @Override + public void setEnabled(boolean enabled, Composite parent) { + super.setEnabled(enabled, parent); + disableUpDownButtons(); + } + + /** + * {@inheritDoc} + * + * @see org.eclipse.jface.preference.ListEditor#setFocus() + */ + @Override + public void setFocus() { + if ((getList() == null) || getList().getItemCount() == 0) { + getAddButton().setFocus(); + } else { + super.setFocus(); + } + } + + /** + * @return the localized dialog title used when a new item is added (may not + * be <code>null</code>) + */ + protected abstract String getNewItemDialogTitle(); + + /** + * @return the localized label on the new item dialog that identifies the + * type of the new item (may not be <code>null</code>) + */ + protected abstract String getNewItemDialogLabel(); + + /** + * @param verifyListener + * a listener that verifies input from the user of a new item + * entry (can be <code>null</code>) + */ + protected void setVerifyListener(VerifyListener verifyListener) { + this.verifyListener = verifyListener; + } + + /** + * A <code>NewItemDialog</code> allows the user to enter a text value. + * Caller can optionally furnish a list of disallowed values. + */ + class NewItemDialog extends Dialog implements ModifyListener { + + /** + * The label describing the new item. + */ + private final String label; + + /** + * A list of disallowed values. If <code>null</code> any non-empty value + * is allowed. + */ + private String[] disallowedValues; + + /** + * A message for the user. + */ + private CLabel lblMessage; + + /** + * The contents of the new item text field. + */ + private String newItem; + + /** + * The dialog title. + */ + private final String title; + + /** + * The listener verifying input characters. + */ + private final VerifyListener verifyListener; + + /** + * @param parentShell + * the parent shell (may be <code>null</code>) + * @param title + * the localized dialog title (never <code>null</code>) + * @param label + * the localized label (never <code>null</code>) + * @param verifyListener + * a listener that validates input characters (may be + * <code>null</code>) + */ + public NewItemDialog(Shell parentShell, String title, String label, VerifyListener verifyListener) { + super(parentShell); + + CheckArg.isNotNull(title, "title"); //$NON-NLS-1$ + CheckArg.isNotNull(label, "label"); //$NON-NLS-1$ + + this.title = title; + this.label = label; + this.verifyListener = verifyListener; + + setShellStyle(getShellStyle() | SWT.RESIZE); + } + + /** + * {@inheritDoc} + * + * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell) + */ + @Override + protected void configureShell(Shell newShell) { + newShell.setText(this.title); + super.configureShell(newShell); + } + + /** + * {@inheritDoc} + * + * @see org.eclipse.jface.dialogs.Dialog#createButton(org.eclipse.swt.widgets.Composite, + * int, java.lang.String, boolean) + */ + @Override + protected Button createButton(Composite parent, int id, String label, boolean defaultButton) { + Button button = super.createButton(parent, id, label, defaultButton); + + // disable OK button initially + if (id == OK) { + button.setEnabled(false); + } + + return button; + } + + /** + * {@inheritDoc} + * + * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite) + */ + @Override + protected Control createDialogArea(Composite parent) { + Composite panel = (Composite) super.createDialogArea(parent); + Composite pnlEditor = new Composite(panel, SWT.NONE); + pnlEditor.setLayout(new GridLayout(2, false)); + pnlEditor.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); + + Label label = new Label(pnlEditor, SWT.NONE); + label.setLayoutData(new GridData(SWT.LEFT, SWT.NONE, false, false)); + label.setText(this.label); + + Text textField = new Text(pnlEditor, SWT.BORDER); + textField.setLayoutData(new GridData(SWT.FILL, SWT.NONE, true, false)); + textField.addModifyListener(this); + + // add listener if necessary + if (this.verifyListener != null) { + textField.addVerifyListener(this.verifyListener); + } + + // add image and message labels + this.lblMessage = new CLabel(pnlEditor, SWT.NONE); + this.lblMessage.setLayoutData(new GridData(SWT.FILL, SWT.NONE, true, false)); + ((GridData) this.lblMessage.getLayoutData()).horizontalSpan = 2; + + return panel; + } + + /** + * @return the new item or <code>null</code> if the dialog was canceled + */ + public String getNewItem() { + if (getReturnCode() == OK) { + return this.newItem; + } + + return null; + } + + /** + * {@inheritDoc} + * + * @see org.eclipse.jface.dialogs.Dialog#initializeBounds() + */ + @Override + protected void initializeBounds() { + super.initializeBounds(); + + // resize shell to be twice the width needed for the title (without + // this the title maybe cropped) + int width = (2 * convertWidthInCharsToPixels(this.title.length())); + Rectangle rectangle = getShell().getBounds(); + getShell().setBounds(rectangle.x, rectangle.y, width, rectangle.height); + } + + /** + * {@inheritDoc} + * + * @see org.eclipse.swt.events.ModifyListener#modifyText(org.eclipse.swt.events.ModifyEvent) + */ + @Override + public void modifyText(ModifyEvent event) { + // clear message + this.lblMessage.setImage(null); + this.lblMessage.setText(""); //$NON-NLS-1$ + + // enable/disable OK button + this.newItem = ((Text) event.widget).getText(); + + // make sure at least one character entered + boolean enable = (this.newItem.length() != 0); + + // make sure value is not a disallowed value + if (enable && (this.disallowedValues != null)) { + for (String disallowedValue : this.disallowedValues) { + if (this.newItem.equals(disallowedValue)) { + enable = false; + this.lblMessage + .setImage(Activator.getDefault().getSharedImage(ISharedImages.IMG_OBJS_INFO_TSK)); + this.lblMessage.setText(RestClientI18n.newItemDialogValueExists.text()); + break; + } + } + } + + // set enabled state if different than current state + if (getButton(OK).getEnabled() != enable) { + getButton(OK).setEnabled(enable); + } + } + + /** + * A list of values that are not allowed as an input. + * + * @param disallowedValues + * the list of values which are not allowed (can be + * <code>null</code> or empty) + */ + public void setDisallowedValues(String[] disallowedValues) { + if ((disallowedValues == null) || (disallowedValues.length == 0)) { + this.disallowedValues = null; + } else { + this.disallowedValues = disallowedValues; + } + } + + } +} Property changes on: branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/preferences/SortedListEditor.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/preferences/prefs.properties =================================================================== --- branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/preferences/prefs.properties 2011-04-04 13:59:30 UTC (rev 30267) +++ branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/preferences/prefs.properties 2011-04-04 14:26:19 UTC (rev 30268) @@ -10,11 +10,14 @@ # individual contributors. # -# This properties file is read in by PrefUtils. The delimiter values are used when the preference values are stored and the -# valid character values are used by the editors when they validate user input. +# This properties file is read in by PreferenceInitializer and contains preference default values. The delimiter values are used +# when the preference values are stored and the valid character values are used by the field editors when they validate user input. fileExtension.delimiter = , fileExtension.invalidChars = *?<>|/\:;. folderName.delimiter = , -folderName.invalidChars = *?<>|/\:; \ No newline at end of file +folderName.invalidChars = *?<>|/\:; + +# indicates if ModeShape server should version resources +enableVersioning = false \ No newline at end of file Modified: branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/views/ServerView.java =================================================================== --- branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/views/ServerView.java 2011-04-04 13:59:30 UTC (rev 30267) +++ branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/views/ServerView.java 2011-04-04 14:26:19 UTC (rev 30268) @@ -12,7 +12,8 @@ package org.jboss.tools.modeshape.rest.views; import static org.jboss.tools.modeshape.rest.IUiConstants.COLLAPSE_ALL_IMAGE; -import static org.jboss.tools.modeshape.rest.IUiConstants.SERVER_VIEW_HELP_CONTEXT; +import static org.jboss.tools.modeshape.rest.IUiConstants.HelpContexts.SERVER_VIEW_HELP_CONTEXT; + import org.eclipse.jface.action.Action; import org.eclipse.jface.action.IAction; import org.eclipse.jface.action.IToolBarManager; @@ -53,10 +54,6 @@ */ public final class ServerView extends ViewPart implements IServerRegistryListener { - // =========================================================================================================================== - // Fields - // =========================================================================================================================== - /** * Collapses all tree nodes. */ @@ -89,10 +86,6 @@ private TreeViewer viewer; - // =========================================================================================================================== - // Methods - // =========================================================================================================================== - private void constructActions() { // the collapse all action is always enabled this.collapseAllAction = new Action() { @@ -325,7 +318,7 @@ * @param selection the current viewer selection (never <code>null</code>) */ private void updateStatusLine( IStructuredSelection selection ) { - String msg = (selection.size() != 1 ? "" : ((IModeShapeObject)selection.getFirstElement()).getShortDescription()); + String msg = (selection.size() != 1 ? "" : ((IModeShapeObject)selection.getFirstElement()).getShortDescription()); //$NON-NLS-1$ getViewSite().getActionBars().getStatusLineManager().setMessage(msg); } Modified: branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/wizards/PublishPage.java =================================================================== --- branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/wizards/PublishPage.java 2011-04-04 13:59:30 UTC (rev 30267) +++ branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/wizards/PublishPage.java 2011-04-04 14:26:19 UTC (rev 30268) @@ -11,13 +11,17 @@ */ package org.jboss.tools.modeshape.rest.wizards; -import static org.jboss.tools.modeshape.rest.IUiConstants.PUBLISH_DIALOG_HELP_CONTEXT; +import static org.jboss.tools.modeshape.rest.IUiConstants.HelpContexts.PUBLISH_DIALOG_HELP_CONTEXT; +import static org.jboss.tools.modeshape.rest.IUiConstants.Preferences.ENABLE_RESOURCE_VERSIONING; +import static org.jboss.tools.modeshape.rest.IUiConstants.Preferences.MAIN_PREFERENCE_PAGE_ID; + import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Map.Entry; + import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFolder; @@ -41,13 +45,16 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Text; +import org.eclipse.swt.widgets.Link; +import org.eclipse.ui.dialogs.PreferencesUtil; import org.eclipse.ui.help.IWorkbenchHelpSystem; import org.jboss.tools.modeshape.rest.Activator; import org.jboss.tools.modeshape.rest.IServerRegistryListener; +import org.jboss.tools.modeshape.rest.IUiConstants; import org.jboss.tools.modeshape.rest.RestClientI18n; import org.jboss.tools.modeshape.rest.ServerManager; import org.jboss.tools.modeshape.rest.ServerRegistryEvent; +import org.jboss.tools.modeshape.rest.WorkspaceArea; import org.jboss.tools.modeshape.rest.actions.NewServerAction; import org.jboss.tools.modeshape.rest.jobs.PublishJob.Type; import org.jboss.tools.modeshape.rest.preferences.PublishingFileFilter; @@ -59,998 +66,1147 @@ import org.modeshape.web.jcr.rest.client.domain.Workspace; /** - * The <code>PublishPage</code> is a UI for publishing or unpublishing one or more files to a repository. + * The <code>PublishPage</code> is a UI for publishing or unpublishing one or + * more files to a repository. */ public final class PublishPage extends WizardPage implements IServerRegistryListener, ModifyListener { - // =========================================================================================================================== - // Constants - // =========================================================================================================================== + /** + * The default repository workspace area where files are published. + */ + private static final String DEFAULT_WORKSPACE_AREA = "/files"; //$NON-NLS-1$ - /** - * The default repository workspace area where files are published. - */ - private static final String DEFAULT_WORKSPACE_AREA = "/files"; + /** + * The key in the wizard <code>IDialogSettings</code> for the recurse flag. + */ + private static final String RECURSE_KEY = "recurse"; //$NON-NLS-1$ - /** - * The key in the wizard <code>IDialogSettings</code> for the recurse flag. - */ - private static final String RECURSE_KEY = "recurse"; + /** + * The key in the wizard <code>IDialogSettings</code> for the workspace area + * path segment. + */ + private static final String WORKSPACE_AREA_KEY = "workspaceArea"; //$NON-NLS-1$ - /** - * The key in the wizard <code>IDialogSettings</code> for the workspace area path segment. - */ - private static final String WORKSPACE_AREA_KEY = "workspaceArea"; + /** + * Indicates if the file filter should be used. + */ + private static boolean filterFiles = true; - // =========================================================================================================================== - // Class Fields - // =========================================================================================================================== + /** + * @param container + * the project or folder whose files are being requested + * @param recurse + * the flag indicating if child containers should be traversed + * @param filter + * the file filter or <code>null</code> if not used + * @return the list of files contained in the specified container (never + * <code>null</code>) + * @throws CoreException + * if there is a problem finding the files + */ + private static List<IFile> findFiles(IContainer container, boolean recurse, PublishingFileFilter filter) + throws CoreException { + List<IFile> result = new ArrayList<IFile>(); - /** - * Indicates if the file filter should be used. - */ - private static boolean filterFiles = true; + if (((container instanceof IProject) && !((IProject) container).isOpen()) + || ((filter != null) && !filter.accept(container))) { + return result; + } - // =========================================================================================================================== - // Class Methods - // =========================================================================================================================== + // process container members + for (IResource member : container.members()) { + if (recurse && (member instanceof IContainer)) { + // don't select closed projects + if ((member instanceof IProject) && !((IProject) member).isOpen()) { + continue; + } - /** - * @param container the project or folder whose files are being requested - * @param recurse the flag indicating if child containers should be traversed - * @param filter the file filter or <code>null</code> if not used - * @return the list of files contained in the specified container (never <code>null</code>) - * @throws CoreException if there is a problem finding the files - */ - private static List<IFile> findFiles( IContainer container, - boolean recurse, - PublishingFileFilter filter ) throws CoreException { - List<IFile> result = new ArrayList<IFile>(); + result.addAll(findFiles((IContainer) member, recurse, filter)); + } else if ((member instanceof IFile) && ((IFile) member).getLocation().toFile().exists()) { + if ((filter == null) || filter.accept(member)) { + result.add((IFile) member); + } + } + } - for (IResource member : container.members()) { - if (recurse && (member instanceof IContainer)) { - // don't select closed projects - if ((member instanceof IProject) && !((IProject)member).isOpen()) { - continue; - } + return result; + } - result.addAll(findFiles((IContainer)member, recurse, filter)); - } else if ((member instanceof IFile) && ((IFile)member).getLocation().toFile().exists()) { - if ((filter == null) || filter.accept(member)) { - result.add((IFile)member); - } - } - } + /** + * Processes the specified list of files and for (1) each file found adds it + * to the result and (2) for each project or folder adds all contained + * files. For projects and folders processing will be recursive based on + * saved wizard settings. + * + * @param resources + * the resources being processed (never <code>null</code>) + * @param recurse + * the flag indicating if child containers should be traversed + * @param filter + * the file filter or <code>null</code> if not used + * @return the files being published or unpublished (never <code>null</code> + * ) + * @throws CoreException + * if there is a problem processing the resources + */ + private static List<IFile> processResources(List<IResource> resources, boolean recurse, PublishingFileFilter filter) + throws CoreException { + assert (resources != null); + List<IFile> result = new ArrayList<IFile>(); - return result; - } + // Project Map - the outer map. Its keys are IProjects and its values + // are a Parent Map + // Parent Map - the inner map. Its keys are IContainers (IProject, + // IFolder) and its values are a list of files + Map<IProject, Map<IContainer, List<IFile>>> projectMap = new HashMap<IProject, Map<IContainer, List<IFile>>>(); - /** - * Processes the specified list of files and for (1) each file found adds it to the result and (2) for each project or folder - * adds all contained files. For projects and folders processing will be recursive based on saved wizard settings. - * - * @param resources the resources being processed (never <code>null</code>) - * @param recurse the flag indicating if child containers should be traversed - * @param filter the file filter or <code>null</code> if not used - * @return the files being published or unpublished (never <code>null</code>) - * @throws CoreException if there is a problem processing the resources - */ - private static List<IFile> processResources( List<IResource> resources, - boolean recurse, - PublishingFileFilter filter ) throws CoreException { - assert (resources != null); - List<IFile> result = new ArrayList<IFile>(); + // Step 1: Process resources + // - For each file make sure there is a project entry and parent entry + // then add the file to the Parent Map. + // - For each folder make sure there is a project entry then add folder + // entry. + // - For each project make sure there is a project entry. + // + // Step 2: Process maps + // - In the Project Map, when the recurse flag is set, entries for + // projects that have a null value (parent map) will be + // traversed finding all child files and them to results. + // - In the internal parent map, when the recurse flag is set, entries + // for parents that have a null value (child + // collection) will be traversed finding all child files and add them to + // results. + // + // Step 3: Add files from Step 1 to results - // Project Map - the outer map. Its keys are IProjects and its values are a Parent Map - // Parent Map - the inner map. Its keys are IContainers (IProject, IFolder) and its values are a list of files - Map<IProject, Map<IContainer, List<IFile>>> projectMap = new HashMap<IProject, Map<IContainer, List<IFile>>>(); + // Step 1 (see above for processing description) + for (IResource resource : resources) { + IFile file = null; + IProject project = null; + List<IFile> files = null; + Map<IContainer, List<IFile>> parentMap = null; - // Step 1: Process resources - // - For each file make sure there is a project entry and parent entry then add the file to the Parent Map. - // - For each folder make sure there is a project entry then add folder entry. - // - For each project make sure there is a project entry. - // - // Step 2: Process maps - // - In the Project Map, when the recurse flag is set, entries for projects that have a null value (parent map) will be - // traversed finding all child files and them to results. - // - In the internal parent map, when the recurse flag is set, entries for parents that have a null value (child - // collection) will be traversed finding all child files and add them to results. - // - // Step 3: Add files from Step 1 to results + // see if resource is filtered + if ((filter != null) && !filter.accept(resource)) { + continue; + } - // Step 1 (see above for processing description) - for (IResource resource : resources) { - IFile file = null; - IProject project = null; - List<IFile> files = null; - Map<IContainer, List<IFile>> parentMap = null; + if (resource instanceof IFile) { + IContainer parent = null; // project or folder + file = (IFile) resource; + parent = file.getParent(); + project = file.getProject(); - // see if resource is filtered - if ((filter != null) && !filter.accept(resource)) { - continue; - } + // make sure there is a project entry + if (!projectMap.containsKey(project)) { + projectMap.put(project, null); + } - if (resource instanceof IFile) { - IContainer parent = null; // project or folder - file = (IFile)resource; - parent = file.getParent(); - project = file.getProject(); + parentMap = projectMap.get(project); - // make sure there is a project entry - if (!projectMap.containsKey(project)) { - projectMap.put(project, null); - } + // make sure there is a parent entry + if (parentMap == null) { + parentMap = new HashMap<IContainer, List<IFile>>(); + projectMap.put(project, parentMap); + } - parentMap = projectMap.get(project); + files = parentMap.get(parent); - // make sure there is a parent entry - if (parentMap == null) { - parentMap = new HashMap<IContainer, List<IFile>>(); - projectMap.put(project, parentMap); - } + // make sure there is a files collection + if (files == null) { + files = new ArrayList<IFile>(); + parentMap.put(parent, files); + } - files = parentMap.get(parent); + // add file + files.add(file); + } else if (resource instanceof IFolder) { + IFolder folder = (IFolder) resource; + project = folder.getProject(); - // make sure there is a files collection - if (files == null) { - files = new ArrayList<IFile>(); - parentMap.put(parent, files); - } + // make sure there is a project entry + if (!projectMap.containsKey(project)) { + projectMap.put(project, null); + } - // add file - files.add(file); - } else if (resource instanceof IFolder) { - IFolder folder = (IFolder)resource; - project = folder.getProject(); + parentMap = projectMap.get(project); - // make sure there is a project entry - if (!projectMap.containsKey(project)) { - projectMap.put(project, null); - } + // make sure there is a folder entry + if (parentMap == null) { + parentMap = new HashMap<IContainer, List<IFile>>(); + projectMap.put(project, parentMap); + } - parentMap = projectMap.get(project); + // add folder only if not already there + if (!parentMap.containsKey(folder)) { + parentMap.put(folder, null); + } + } else if (resource instanceof IProject) { + project = (IProject) resource; - // make sure there is a folder entry - if (parentMap == null) { - parentMap = new HashMap<IContainer, List<IFile>>(); - projectMap.put(project, parentMap); - } + // if map does not have entry create one + if (!projectMap.containsKey(project)) { + projectMap.put(project, null); + } + } + } - // add folder only if not already there - if (!parentMap.containsKey(folder)) { - parentMap.put(folder, null); - } - } else if (resource instanceof IProject) { - project = (IProject)resource; + // Step 2 (see above for processing description) + // Process projects that have nothing under them selected + for (IProject project : projectMap.keySet()) { + Map<IContainer, List<IFile>> parentMap = projectMap.get(project); - // if map does not have entry create one - if (!projectMap.containsKey(project)) { - projectMap.put(project, null); - } - } - } + if (parentMap == null) { + result.addAll(findFiles(project, recurse, filter)); + } else { + // process folders with no folder entries + for (IContainer folder : parentMap.keySet()) { + List<IFile> files = parentMap.get(folder); - // Step 2 (see above for processing description) - // Process projects that have nothing under them selected - for (IProject project : projectMap.keySet()) { - Map<IContainer, List<IFile>> parentMap = projectMap.get(project); + if (files == null) { + result.addAll(findFiles(folder, recurse, filter)); + } + } + } + } - if (parentMap == null) { - result.addAll(findFiles(project, recurse, filter)); - } else { - // process folders with no folder entries - for (IContainer folder : parentMap.keySet()) { - List<IFile> files = parentMap.get(folder); + // Step 3 (see above for processing description) + for (IProject project : projectMap.keySet()) { + Map<IContainer, List<IFile>> parentMap = projectMap.get(project); - if (files == null) { - result.addAll(findFiles(folder, recurse, filter)); - } - } - } - } + if (parentMap != null) { + for (Entry<IContainer, List<IFile>> entry : parentMap.entrySet()) { + if (entry.getValue() != null) { + result.addAll(entry.getValue()); + } + } + } + } - // Step 3 (see above for processing description) - for (IProject project : projectMap.keySet()) { - Map<IContainer, List<IFile>> parentMap = projectMap.get(project); + return result; + } - if (parentMap != null) { - for (Entry<IContainer, List<IFile>> entry : parentMap.entrySet()) { - if (entry.getValue() != null) { - result.addAll(entry.getValue()); - } - } - } - } + /** + * The repository chooser control. + */ + private Combo cbxRepository; - return result; - } + /** + * The server chooser control. + */ + private Combo cbxServer; - // =========================================================================================================================== - // Fields - // =========================================================================================================================== + /** + * The workspace chooser control. + */ + private Combo cbxWorkspace; - /** - * The repository chooser control. - */ - private Combo cbxRepository; + /** + * The workspace area chooser control. + */ + private Combo cbxWorkspaceAreas; - /** - * The server chooser control. - */ - private Combo cbxServer; + /** + * The files being published or unpublished (never <code>null</code>). + */ + private List<IFile> files; - /** - * The workspace chooser control. - */ - private Combo cbxWorkspace; + /** + * The filter used to determine if a file should be included in publishing + * operations (may be <code>null</code>). + */ + private PublishingFileFilter filter; - /** - * The files being published or unpublished (never <code>null</code>). - */ - private List<IFile> files; + /** + * The control containing all the files being published or unpublished. + */ + private org.eclipse.swt.widgets.List lstResources; - /** - * The filter used to determine if a file should be included in publishing operations (may be <code>null</code>). - */ - private PublishingFileFilter filter; + /** + * Indicates if resources should be found recursively. + */ + private boolean recurse = true; - /** - * The control containing all the files being published or unpublished. - */ - private org.eclipse.swt.widgets.List lstResources; + /** + * A collection of repositories for the selected server (never + * <code>null</code>). + */ + private List<Repository> repositories; - /** - * Indicates if resources should be found recursively. - */ - private boolean recurse = true; + /** + * The repository where the workspace is located. + */ + private Repository repository; - /** - * A collection of repositories for the selected server (never <code>null</code>). - */ - private List<Repository> repositories; + /** + * The collection of resources selected by the user to be published or + * unpublished. + */ + private final List<IResource> resources; - /** - * The repository where the workspace is located. - */ - private Repository repository; + /** + * The server where the repository is located. + */ + private Server server; - /** - * The collection of resources selected by the user to be published or unpublished. - */ - private final List<IResource> resources; + /** + * A collection of servers from the server registry (never <code>null</code> + * ). + */ + private List<Server> servers; - /** - * The server where the repository is located. - */ - private Server server; + /** + * The current validation status. + */ + private Status status; - /** - * A collection of servers from the server registry (never <code>null</code>). - */ - private List<Server> servers; + /** + * Indicates if publishing or unpublishing is being done. + */ + private final Type type; - /** - * The current validation status. - */ - private Status status; + /** + * Indicates if versioning of published resources should be done. + */ + private boolean versioning = true; - /** - * Indicates if publishing or unpublishing is being done. - */ - private final Type type; + /** + * The workspace where the resources are being published/unpublished (may be + * <code>null</code>). + */ + private Workspace workspace; - /** - * The workspace where the resources are being published/unpublished (may be <code>null</code>). - */ - private Workspace workspace; + /** + * The path segment prepended to the resource project path. + */ + private String workspaceArea; - /** - * The path segment prepended to the resource project path. - */ - private String workspaceArea; + /** + * A collection of workspaces for the selected server repository (never + * <code>null</code>). + */ + private List<Workspace> workspaces; - /** - * A collection of workspaces for the selected server repository (never <code>null</code>). - */ - private List<Workspace> workspaces; + /** + * @param type + * indicates if publishing or unpublishing is being done + * @param resources + * the resources being published or unpublished (never + * <code>null</code>) + * @throws CoreException + * if there is a problem processing the input resources + */ + public PublishPage(Type type, List<IResource> resources) throws CoreException { + super(PublishPage.class.getSimpleName()); + CheckArg.isNotNull(resources, "resources"); //$NON-NLS-1$ + setTitle((type == Type.PUBLISH) ? RestClientI18n.publishPagePublishTitle.text() + : RestClientI18n.publishPageUnpublishTitle.text()); + setPageComplete(false); - // =========================================================================================================================== - // Constructors - // =========================================================================================================================== + this.type = type; + this.resources = resources; - /** - * @param type indicates if publishing or unpublishing is being done - * @param resources the resources being published or unpublished (never <code>null</code>) - * @throws CoreException if there is a problem processing the input resources - */ - public PublishPage( Type type, - List<IResource> resources ) throws CoreException { - super(PublishPage.class.getSimpleName()); - CheckArg.isNotNull(resources, "resources"); - setTitle((type == Type.PUBLISH) ? RestClientI18n.publishPagePublishTitle.text() - : RestClientI18n.publishPageUnpublishTitle.text()); - setPageComplete(false); + // filter should not be cached as preferences may change + this.filter = (filterFiles ? new PublishingFileFilter() : null); + } - this.type = type; - this.resources = resources; + private void constructLocationPanel(Composite parent) { + Group pnl = new Group(parent, SWT.NONE); + pnl.setText(RestClientI18n.publishPageLocationGroupTitle.text()); + pnl.setLayout(new GridLayout(2, false)); + pnl.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false)); - // filter should not be cached as preferences may change - this.filter = (filterFiles ? new PublishingFileFilter() : null); - } + // row 1: label combobox button + // row 2: label combobox + // row 3: label combobox + // row 4: label textbox - // =========================================================================================================================== - // Methods - // =========================================================================================================================== + { // row 1: server row + Composite pnlServer = new Composite(pnl, SWT.NONE); + GridLayout layout = new GridLayout(3, false); + layout.marginHeight = 0; + layout.marginWidth = 0; + pnlServer.setLayout(layout); + GridData gd = new GridData(SWT.FILL, SWT.CENTER, true, false); + gd.horizontalSpan = 2; + pnlServer.setLayoutData(gd); - private void constructLocationPanel( Composite parent ) { - Group pnl = new Group(parent, SWT.NONE); - pnl.setText(RestClientI18n.publishPageLocationGroupTitle.text()); - pnl.setLayout(new GridLayout(2, false)); - pnl.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false)); + Label lblServer = new Label(pnlServer, SWT.LEFT); + lblServer.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false)); + lblServer.setText(RestClientI18n.publishPageServerLabel.text()); - // row 1: label combobox button - // row 2: label combobox - // row 3: label combobox - // row 4: label textbox + this.cbxServer = new Combo(pnlServer, SWT.DROP_DOWN | SWT.READ_ONLY); + this.cbxServer.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false)); + this.cbxServer.setToolTipText(RestClientI18n.publishPageServerToolTip.text()); - { // row 1: server row - Composite pnlServer = new Composite(pnl, SWT.NONE); - GridLayout layout = new GridLayout(3, false); - layout.marginHeight = 0; - layout.marginWidth = 0; - pnlServer.setLayout(layout); - GridData gd = new GridData(SWT.FILL, SWT.CENTER, true, false); - gd.horizontalSpan = 2; - pnlServer.setLayoutData(gd); + final IAction action = new NewServerAction(this.getShell(), getServerManager()); + final Button btnNewServer = new Button(pnlServer, SWT.PUSH); + btnNewServer.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false)); + btnNewServer.setText(RestClientI18n.publishPageNewServerButton.text()); + btnNewServer.setToolTipText(action.getToolTipText()); + btnNewServer.addSelectionListener(new SelectionAdapter() { + /** + * {@inheritDoc} + * + * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent) + */ + @Override + public void widgetSelected(SelectionEvent e) { + action.run(); + } + }); - Label lblServer = new Label(pnlServer, SWT.LEFT); - lblServer.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false)); - lblServer.setText(RestClientI18n.publishPageServerLabel.text()); + // update page message first time selected to get rid of initial + // message by forcing validation + btnNewServer.addSelectionListener(new SelectionAdapter() { + /** + * {@inheritDoc} + * + * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent) + */ + @Override + public void widgetSelected(SelectionEvent e) { + updateInitialMessage(); + btnNewServer.removeSelectionListener(this); + } + }); + } - this.cbxServer = new Combo(pnlServer, SWT.DROP_DOWN | SWT.READ_ONLY); - this.cbxServer.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false)); - this.cbxServer.setToolTipText(RestClientI18n.publishPageServerToolTip.text()); + { // row 2: repository row + Label lblRepository = new Label(pnl, SWT.LEFT); + lblRepository.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false)); + lblRepository.setText(RestClientI18n.publishPageRepositoryLabel.text()); - final IAction action = new NewServerAction(this.getShell(), getServerManager()); - final Button btnNewServer = new Button(pnlServer, SWT.PUSH); - btnNewServer.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false)); - btnNewServer.setText(RestClientI18n.publishPageNewServerButton.text()); - btnNewServer.setToolTipText(action.getToolTipText()); - btnNewServer.addSelectionListener(new SelectionAdapter() { - /** - * {@inheritDoc} - * - * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent) - */ - @Override - public void widgetSelected( SelectionEvent e ) { - action.run(); - } - }); + this.cbxRepository = new Combo(pnl, SWT.DROP_DOWN | SWT.READ_ONLY); + this.cbxRepository.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false)); + this.cbxRepository.setToolTipText(RestClientI18n.publishPageRepositoryToolTip.text()); + } - // update page message first time selected to get rid of initial message by forcing validation - btnNewServer.addSelectionListener(new SelectionAdapter() { - /** - * {@inheritDoc} - * - * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent) - */ - @Override - public void widgetSelected( SelectionEvent e ) { - updateInitialMessage(); - btnNewServer.removeSelectionListener(this); - } - }); - } + { // row 3: workspace row + Label lblWorkspace = new Label(pnl, SWT.LEFT); + lblWorkspace.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false)); + lblWorkspace.setText(RestClientI18n.publishPageWorkspaceLabel.text()); - { // row 2: repository row - Label lblRepository = new Label(pnl, SWT.LEFT); - lblRepository.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false)); - lblRepository.setText(RestClientI18n.publishPageRepositoryLabel.text()); + this.cbxWorkspace = new Combo(pnl, SWT.DROP_DOWN | SWT.READ_ONLY); + this.cbxWorkspace.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false)); - this.cbxRepository = new Combo(pnl, SWT.DROP_DOWN | SWT.READ_ONLY); - this.cbxRepository.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false)); - this.cbxRepository.setToolTipText(RestClientI18n.publishPageRepositoryToolTip.text()); - } + if (type == Type.PUBLISH) { + this.cbxWorkspace.setToolTipText(RestClientI18n.publishPageWorkspacePublishToolTip.text()); + } else { + this.cbxWorkspace.setToolTipText(RestClientI18n.publishPageWorkspaceUnpublishToolTip.text()); + } + } - { // row 3: workspace row - Label lblWorkspace = new Label(pnl, SWT.LEFT); - lblWorkspace.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false)); - lblWorkspace.setText(RestClientI18n.publishPageWorkspaceLabel.text()); + { // row 4: workspace area + Label lblWorkspaceArea = new Label(pnl, SWT.LEFT); + lblWorkspaceArea.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false)); + lblWorkspaceArea.setText(RestClientI18n.publishPageWorkspaceAreaLabel.text()); - this.cbxWorkspace = new Combo(pnl, SWT.DROP_DOWN | SWT.READ_ONLY); - this.cbxWorkspace.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false)); + this.cbxWorkspaceAreas = new Combo(pnl, SWT.DROP_DOWN); + this.cbxWorkspaceAreas.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false)); + this.cbxWorkspaceAreas.setToolTipText(RestClientI18n.publishPageWorkspaceAreaToolTip.text()); + } + } - if (type == Type.PUBLISH) { - this.cbxWorkspace.setToolTipText(RestClientI18n.publishPageWorkspacePublishToolTip.text()); - } else { - this.cbxWorkspace.setToolTipText(RestClientI18n.publishPageWorkspaceUnpublishToolTip.text()); - } - } + private void constructResourcesPanel(Composite parent) { + Composite pnl = new Composite(parent, SWT.NONE); + pnl.setLayout(new GridLayout()); + pnl.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); - { // row 4: workspace area - Label lblWorkspaceArea = new Label(pnl, SWT.LEFT); - lblWorkspaceArea.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false)); - lblWorkspaceArea.setText(RestClientI18n.publishPageWorkspaceAreaLabel.text()); + // pnl layout: + // row 1: lbl + // row 2: lstResources + // row 3: recurse chkbox + // row 4: versioning chkbox and link (only when publishing) - Text txtWorkspaceArea = new Text(pnl, SWT.BORDER); - txtWorkspaceArea.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false)); - txtWorkspaceArea.setToolTipText(RestClientI18n.publishPageWorkspaceAreaToolTip.text()); - txtWorkspaceArea.addModifyListener(new ModifyListener() { - /** - * {@inheritDoc} - * - * @see org.eclipse.swt.events.ModifyListener#modifyText(org.eclipse.swt.events.ModifyEvent) - */ - @Override - public void modifyText( ModifyEvent e ) { - handleWorkspaceAreaModified(((Text)e.widget).getText()); - } - }); + { // row 1 + Label lbl = new Label(pnl, SWT.LEFT); + lbl.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false)); - // set the workspace area from the dialog settings - String temp = getDialogSettings().get(WORKSPACE_AREA_KEY); - this.workspaceArea = ((temp == null) ? DEFAULT_WORKSPACE_AREA : temp); - txtWorkspaceArea.setText(this.workspaceArea); - } - } + if (type == Type.PUBLISH) { + lbl.setText(RestClientI18n.publishPagePublishResourcesLabel.text()); + } else { + lbl.setText(RestClientI18n.publishPageUnpublishResourcesLabel.text()); + } + } - private void constructResourcesPanel( Composite parent ) { - Composite pnl = new Composite(parent, SWT.NONE); - pnl.setLayout(new GridLayout()); - pnl.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); + { // row 2 + this.lstResources = new org.eclipse.swt.widgets.List(pnl, SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL); + GridData gd = new GridData(SWT.FILL, SWT.FILL, true, true); + gd.horizontalSpan = 2; + gd.minimumHeight = this.lstResources.getItemHeight() * 2; // set min + // height + gd.heightHint = this.lstResources.getItemHeight() * 10; // set + // preferred + // height + this.lstResources.setLayoutData(gd); + final org.eclipse.swt.widgets.List finalLst = this.lstResources; - // pnl layout: - // row 1: lbl - // row 2: lstResources - // row 3: chkbox + // update page message first time selected to get rid of initial + // message by forcing validation + this.lstResources.addSelectionListener(new SelectionAdapter() { + /** + * {@inheritDoc} + * + * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent) + */ + @Override + public void widgetSelected(SelectionEvent e) { + // do the very first time to get rid of initial message then + // remove listener + updateInitialMessage(); + finalLst.removeSelectionListener(this); + } + }); - { // row 1 - Label lbl = new Label(pnl, SWT.LEFT); - lbl.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false)); + // load list with initial files + loadFiles(); + } - if (type == Type.PUBLISH) { - lbl.setText(RestClientI18n.publishPagePublishResourcesLabel.text()); - } else { - lbl.setText(RestClientI18n.publishPageUnpublishResourcesLabel.text()); - } - } + { // row 3 recurse chkbox + Button chkRecurse = new Button(pnl, SWT.CHECK); + chkRecurse.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false)); + chkRecurse.setText(RestClientI18n.publishPageRecurseCheckBox.text()); + chkRecurse.setToolTipText(RestClientI18n.publishPageRecurseCheckBoxToolTip.text()); - { // row 2 - this.lstResources = new org.eclipse.swt.widgets.List(pnl, SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL); - GridData gd = new GridData(SWT.FILL, SWT.FILL, true, true); - gd.horizontalSpan = 2; - this.lstResources.setLayoutData(gd); - final org.eclipse.swt.widgets.List finalLst = this.lstResources; + // set the recurse flag based on dialog settings + if (getDialogSettings().get(RECURSE_KEY) != null) { + this.recurse = getDialogSettings().getBoolean(RECURSE_KEY); + } - // update page message first time selected to get rid of initial message by forcing validation - this.lstResources.addSelectionListener(new SelectionAdapter() { - /** - * {@inheritDoc} - * - * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent) - */ - @Override - public void widgetSelected( SelectionEvent e ) { - // do the very first time to get rid of initial message then remove listener - updateInitialMessage(); - finalLst.removeSelectionListener(this); - } - }); + chkRecurse.setSelection(this.recurse); + chkRecurse.addSelectionListener(new SelectionAdapter() { + /** + * {@inheritDoc} + * + * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent) + */ + @Override + public void widgetSelected(SelectionEvent e) { + handleRecurseChanged(((Button) e.widget).getSelection()); + } + }); - // load list with initial files - loadFiles(); - } + // update page message first time selected to get rid of initial + // message by forcing validation + chkRecurse.addSelectionListener(new SelectionAdapter() { + /** + * {@inheritDoc} + * + * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent) + */ + @Override + public void widgetSelected(SelectionEvent e) { + updateInitialMessage(); + ((Button) e.widget).removeSelectionListener(this); + } + }); + } - { // row 3 - Button chkRecurse = new Button(pnl, SWT.CHECK); - chkRecurse.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false)); - chkRecurse.setText(RestClientI18n.publishPageRecurseCheckBox.text()); - chkRecurse.setToolTipText(RestClientI18n.publishPageRecurseCheckBoxToolTip.text()); + if (this.type == Type.PUBLISH) { + // row 4 versioning chkbox and link to open preference page + Composite pnlVersioning = new Composite(pnl, SWT.NONE); + pnlVersioning.setLayout(new GridLayout(2, false)); + ((GridLayout) pnlVersioning.getLayout()).marginWidth = 0; + pnlVersioning.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, true)); + ((GridData) pnlVersioning.getLayoutData()).minimumHeight = 30; - // set the recurse flag based on dialog settings - if (getDialogSettings().get(RECURSE_KEY) != null) { - this.recurse = getDialogSettings().getBoolean(RECURSE_KEY); - } + Button chkVersioning = new Button(pnlVersioning, SWT.CHECK); + chkVersioning.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false)); + chkVersioning.setText(RestClientI18n.publishPageVersionCheckBox.text()); + chkVersioning.setToolTipText(RestClientI18n.publishPageVersionCheckBoxToolTip.text()); - chkRecurse.setSelection(this.recurse); - chkRecurse.addSelectionListener(new SelectionAdapter() { - /** - * {@inheritDoc} - * - * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent) - */ - @Override - public void widgetSelected( SelectionEvent e ) { - handleRecurseChanged(((Button)e.widget).getSelection()); - } - }); + // set the version flag based on preference + this.versioning = Activator.getDefault().getPreferenceStore().getBoolean(ENABLE_RESOURCE_VERSIONING); - // update page message first time selected to get rid of initial message by forcing validation - chkRecurse.addSelectionListener(new SelectionAdapter() { - /** - * {@inheritDoc} - * - * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent) - */ - @Override - public void widgetSelected( SelectionEvent e ) { - updateInitialMessage(); - ((Button)e.widget).removeSelectionListener(this); - } - }); - } - } + chkVersioning.setSelection(this.versioning); + chkVersioning.addSelectionListener(new SelectionAdapter() { + /** + * {@inheritDoc} + * + * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent) + */ + @Override + public void widgetSelected(SelectionEvent e) { + handleVersioningChanged(((Button) e.widget).getSelection()); + } + }); - /** - * {@inheritDoc} - * - * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite) - */ - @Override - public void createControl( Composite parent ) { - Composite pnlMain = new Composite(parent, SWT.NONE); - pnlMain.setLayout(new GridLayout()); - pnlMain.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false)); - constructLocationPanel(pnlMain); - constructResourcesPanel(pnlMain); - setControl(pnlMain); + Link link = new Link(pnlVersioning, SWT.WRAP); + link.setText(RestClientI18n.publishPageOpenPreferencePageLink.text()); + link.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false)); + link.addSelectionListener(new SelectionAdapter() { + /** + * {@inheritDoc} + * + * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent) + */ + @Override + public void widgetSelected(SelectionEvent e) { + handleOpenPreferencePage(); + } + }); + } + } - // add combobox listeners - this.cbxRepository.addModifyListener(this); - this.cbxServer.addModifyListener(this); - this.cbxWorkspace.addModifyListener(this); + /** + * {@inheritDoc} + * + * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite) + */ + @Override + public void createControl(Composite parent) { + Composite pnlMain = new Composite(parent, SWT.NONE); + pnlMain.setLayout(new GridLayout()); + pnlMain.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false)); + constructLocationPanel(pnlMain); + constructResourcesPanel(pnlMain); + setControl(pnlMain); - // register with the help system - IWorkbenchHelpSystem helpSystem = Activator.getDefault().getWorkbench().getHelpSystem(); - helpSystem.setHelp(pnlMain, PUBLISH_DIALOG_HELP_CONTEXT); + // add combobox listeners + this.cbxRepository.addModifyListener(this); + this.cbxServer.addModifyListener(this); + this.cbxWorkspace.addModifyListener(this); + this.cbxWorkspaceAreas.addModifyListener(this); - // register to receive server registry events (this will populate the UI) - getServerManager().addRegistryListener(this); - } + // register with the help system + IWorkbenchHelpSystem helpSystem = Activator.getDefault().getWorkbench().getHelpSystem(); + helpSystem.setHelp(pnlMain, PUBLISH_DIALOG_HELP_CONTEXT); - /** - * {@inheritDoc} - * - * @see org.eclipse.jface.dialogs.DialogPage#dispose() - */ - @Override - public void dispose() { - getServerManager().removeRegistryListener(this); - super.dispose(); - } + // register to receive server registry events (this will populate the + // UI) + getServerManager().addRegistryListener(this); + } - /** - * @return the files to publish or unpublish (never <code>null</code>) - */ - List<IFile> getFiles() { - return this.files; - } + /** + * {@inheritDoc} + * + * @see org.eclipse.jface.dialogs.DialogPage#dispose() + */ + @Override + public void dispose() { + getServerManager().removeRegistryListener(this); + super.dispose(); + } - /** - * @return the server manager obtained from the wizard - */ - private ServerManager getServerManager() { - return ((PublishWizard)getWizard()).getServerManager(); - } + /** + * @return the files to publish or unpublish (never <code>null</code>) + */ + List<IFile> getFiles() { + return this.files; + } - /** - * @return thw workspace to use when publishing or unpublishing (page must be complete) - */ - Workspace getWorkspace() { - assert isPageComplete(); - return this.workspace; - } + /** + * @return the server manager obtained from the wizard + */ + private ServerManager getServerManager() { + return ((PublishWizard) getWizard()).getServerManager(); + } - /** - * @return the path segment prepended to the resource project path (never <code>null</code> but can be empty) - */ - String getWorkspaceArea() { - return this.workspaceArea; - } + /** + * @return thw workspace to use when publishing or unpublishing (page must + * be complete) + */ + Workspace getWorkspace() { + assert isPageComplete(); + return this.workspace; + } - /** - * Saves the recurse setting and reloads the files to be published or unpublished. - * - * @param selected the flag indicating the new recurse setting - */ - void handleRecurseChanged( boolean selected ) { - this.recurse = selected; + /** + * @return the path segment prepended to the resource project path (never + * <code>null</code> but can be empty) + */ + String getWorkspaceArea() { + return this.workspaceArea; + } - try { - this.files = processResources(this.resources, isRecursing(), filter); - loadFiles(); - } catch (CoreException e) { - Activator.getDefault().log(new Status(Severity.ERROR, RestClientI18n.publishPageRecurseProcessingErrorMsg.text(), e)); + /** + * Opens the preference page. + */ + void handleOpenPreferencePage() { + // open preference page and only allow the pref page where the version + // setting is + PreferencesUtil.createPreferenceDialogOn(getShell(), MAIN_PREFERENCE_PAGE_ID, + new String[] { MAIN_PREFERENCE_PAGE_ID, IUiConstants.Preferences.FILTERS_PREFERENCE_PAGE_ID }, null) + .open(); + } - if (getControl().isVisible()) { - MessageDialog.openError(getShell(), - RestClientI18n.errorDialogTitle.text(), - RestClientI18n.publishPageRecurseProcessingErrorMsg.text()); - } - } - } + /** + * Saves the recurse setting and reloads the files to be published or + * unpublished. + * + * @param selected + * the flag indicating the new recurse setting + */ + void handleRecurseChanged(boolean selected) { + this.recurse = selected; - /** - * Handler for when the repository control value is modified - */ - void handleRepositoryModified() { - int index = this.cbxRepository.getSelectionIndex(); + try { + this.files = processResources(this.resources, isRecursing(), filter); + loadFiles(); + } catch (CoreException e) { + Activator.getDefault().log( + new Status(Severity.ERROR, RestClientI18n.publishPageRecurseProcessingErrorMsg.text(), e)); - // make sure there is a selection - if (index != -1) { - this.repository = this.repositories.get(index); - } + if (getControl().isVisible()) { + MessageDialog.openError(getShell(), RestClientI18n.errorDialogTitle.text(), + RestClientI18n.publishPageRecurseProcessingErrorMsg.text()); + } + } + } - // clear loaded workspaces - refreshWorkspaces(); + /** + * Handler for when the repository control value is modified + */ + void handleRepositoryModified() { + int index = this.cbxRepository.getSelectionIndex(); - // update page state - updateState(); - } + // make sure there is a selection + if (index != -1) { + this.repository = this.repositories.get(index); + } - /** - * Handler for when the server control value is modified - */ - void handleServerModified() { - int index = this.cbxServer.getSelectionIndex(); + // clear loaded workspaces + refreshWorkspaces(); - // make sure there is a selection - if (index != -1) { - this.server = this.servers.get(index); - } + // update page state + updateState(); + } - // need to reload repositories since server changed - refreshRepositories(); + /** + * Handler for when the server control value is modified + */ + void handleServerModified() { + int index = this.cbxServer.getSelectionIndex(); - // update page state - updateState(); - } + // make sure there is a selection + if (index != -1) { + this.server = this.servers.get(index); + } - /** - * Handler for when the workspace area value is modified. - * - * @param workspaceArea the new workspace area (never <code>null</code>) - */ - void handleWorkspaceAreaModified( String workspaceArea ) { - this.workspaceArea = workspaceArea.trim(); - } + // need to reload repositories since server changed + refreshRepositories(); - /** - * Handler for when the workspace control value is modified. - */ - void handleWorkspaceModified() { - int index = this.cbxWorkspace.getSelectionIndex(); + // update page state + updateState(); + } - // make sure there is a selection - if (index != -1) { - this.workspace = this.workspaces.get(index); - } + /** + * Saves the versioning setting. + * + * @param selected + * the flag indicating the new versioning setting + */ + void handleVersioningChanged(boolean selected) { + this.versioning = selected; + } - updateState(); - } + /** + * Handler for when the workspace area value is modified. + */ + void handleWorkspaceAreaModified() { + int index = this.cbxWorkspaceAreas.getSelectionIndex(); - /** - * @return <code>true</code> if resources found recursively under projects and folders should also be published or unpublished - */ - boolean isRecursing() { - return this.recurse; - } + if (index == -1) { + this.workspaceArea = this.cbxWorkspaceAreas.getText(); + } else { + this.workspaceArea = this.cbxWorkspaceAreas.getItems()[index]; + } + } - /** - * Populates the list of files to be published based on the recurse flag and the list of workspace selected resources. - * Pre-condition is that {@link #processResources(List, boolean, PublishingFileFilter)} has been called. - */ - private void loadFiles() { - this.lstResources.removeAll(); + /** + * Handler for when the workspace control value is modified. + */ + void handleWorkspaceModified() { + int index = this.cbxWorkspace.getSelectionIndex(); - for (IResource resource : this.files) { - this.lstResources.add(resource.getFullPath().toString()); - } - } + // make sure there is a selection + if (index != -1) { + Workspace newWorkspace = this.workspaces.get(index); - /** - * {@inheritDoc} - * - * @see org.eclipse.swt.events.ModifyListener#modifyText(org.eclipse.swt.events.ModifyEvent) - */ - @Override - public void modifyText( ModifyEvent e ) { - if (e.widget == this.cbxServer) { - handleServerModified(); - } else if (e.widget == this.cbxRepository) { - handleRepositoryModified(); - } else if (e.widget == this.cbxWorkspace) { - handleWorkspaceModified(); - } else { - assert false; // should not happen - } - } + if ((this.workspace == null) || !this.workspace.equals(newWorkspace)) { + this.workspace = newWorkspace; - /** - * Refreshes the repository-related fields and controls based on the server registry. This in turn causes the workspaces to - * also to be refreshed. - */ - private void refreshRepositories() { - this.repository = null; + // update workspace areas + WorkspaceArea[] workspaceAreas = null; - if (this.server == null) { - this.repositories = Collections.emptyList(); - } else { - try { - this.repositories = new ArrayList<Repository>(getServerManager().getRepositories(this.server)); - } catch (Exception e) { - this.repositories = Collections.emptyList(); - String msg = RestClientI18n.serverManagerGetRepositoriesExceptionMsg.text(this.server.getShortDescription()); - Activator.getDefault().log(new Status(Severity.ERROR, msg, e)); + try { + workspaceAreas = getServerManager().getWorkspaceAreas(this.workspace); + } catch (Exception e) { + Activator.getDefault().log( + new Status(Severity.ERROR, RestClientI18n.publishPageUnableToObtainWorkspaceAreas + .text(this.workspace), e)); + } - if (getControl().isVisible()) { - MessageDialog.openError(getShell(), RestClientI18n.errorDialogTitle.text(), msg); - } - } - } + if ((workspaceAreas == null) || (workspaceAreas.length == 0)) { + // populate with default area name + this.cbxWorkspaceAreas.setItems(new String[] { DEFAULT_WORKSPACE_AREA }); + } else { + String[] areaPaths = new String[workspaceAreas.length]; + int i = 0; - // clear items - this.cbxRepository.removeAll(); + for (WorkspaceArea area : workspaceAreas) { + areaPaths[i++] = area.getPath(); + } - // reload - if (this.repositories.isEmpty()) { - // disable control if necessary - if (this.cbxRepository.getEnabled()) { - this.cbxRepository.setEnabled(false); - } - } else if (this.repositories.size() == 1) { - this.repository = this.repositories.get(0); - this.cbxRepository.add(this.repository.getName()); - this.cbxRepository.select(0); + this.cbxWorkspaceAreas.setItems(areaPaths); + } + } + } else { + this.workspaceArea = null; + this.cbxWorkspaceAreas.removeAll(); + } - // enable control if necessary - if (!this.cbxRepository.getEnabled()) { - this.cbxRepository.setEnabled(true); - } - } else { - // add an item for each repository - for (Repository repository : this.repositories) { - this.cbxRepository.add(repository.getName()); - } + if (this.cbxWorkspaceAreas.getItemCount() != 0) { + this.cbxWorkspaceAreas.select(0); + } - // enable control if necessary - if (!this.cbxRepository.getEnabled()) { - this.cbxRepository.setEnabled(true); - } - } + updateState(); + } - // must reload workspaces - refreshWorkspaces(); - } + /** + * @return <code>true</code> if resources found recursively under projects + * and folders should also be published or unpublished + */ + boolean isRecursing() { + return this.recurse; + } - /** - * Refreshes the server-related fields and controls based on the server registry. This in turn causes the repositories and - * workspaces to also to be refreshed. - */ - void refreshServers() { - this.server = null; - this.servers = new ArrayList<Server>(getServerManager().getServers()); + /** + * @return <code>true</code> if versioning of published resources should be + * done + */ + boolean isVersioning() { + return this.versioning; + } - // clear server combo - this.cbxServer.removeAll(); + /** + * Populates the list of files to be published based on the recurse flag and + * the list of workspace selected resources. Pre-condition is that + * {@link #processResources(List, boolean, PublishingFileFilter)} has been + * called. + */ + private void loadFiles() { + this.lstResources.removeAll(); - if (this.servers.size() == 0) { - // disable control if necessary - if (this.cbxServer.getEnabled()) { - this.cbxServer.setEnabled(false); - } - } else if (this.servers.size() == 1) { - this.server = this.servers.get(0); - this.cbxServer.add(this.server.getName()); - this.cbxServer.select(0); + for (IResource resource : this.files) { + this.lstResources.add(resource.getFullPath().toString()); + } + } - // enable control if necessary - if (!this.cbxServer.getEnabled()) { - this.cbxServer.setEnabled(true); - } - } else { - // add an item for each server - for (Server server : this.servers) { - this.cbxServer.add(server.getName()); - } + /** + * {@inheritDoc} + * + * @see org.eclipse.swt.events.ModifyListener#modifyText(org.eclipse.swt.events.ModifyEvent) + */ + @Override + public void modifyText(ModifyEvent e) { + if (e.widget == this.cbxServer) { + handleServerModified(); + } else if (e.widget == this.cbxRepository) { + handleRepositoryModified(); + } else if (e.widget == this.cbxWorkspace) { + handleWorkspaceModified(); + } else if (e.widget == this.cbxWorkspaceAreas) { + handleWorkspaceAreaModified(); + } else { + assert false; // should not happen + } + } - // enable control if necessary - if (!this.cbxServer.getEnabled()) { - this.cbxServer.setEnabled(true); - } - } + /** + * Refreshes the repository-related fields and controls based on the server + * registry. This in turn causes the workspaces to also to be refreshed. + */ + private void refreshRepositories() { + this.repository = null; - // must reload repositories - refreshRepositories(); - } + if (this.server == null) { + this.repositories = Collections.emptyList(); + } else { + try { + this.repositories = new ArrayList<Repository>(getServerManager().getRepositories(this.server)); + } catch (Exception e) { + this.repositories = Collections.emptyList(); + String msg = RestClientI18n.serverManagerGetRepositoriesExceptionMsg.text(this.server + .getShortDescription()); + Activator.getDefault().log(new Status(Severity.ERROR, msg, e)); + } + } - /** - * Refreshes the workspace-related fields and controls based on the server registry. - */ - private void refreshWorkspaces() { - this.workspace = null; + // clear items + this.cbxRepository.removeAll(); - if (this.repository == null) { - this.workspaces = Collections.emptyList(); - } else { - try { - this.workspaces = new ArrayList<Workspace>(getServerManager().getWorkspaces(this.repository)); - } catch (Exception e) { - this.workspaces = Collections.emptyList(); - String msg = RestClientI18n.serverManagerGetWorkspacesExceptionMsg.text(this.repository); - Activator.getDefault().log(new Status(Severity.ERROR, msg, e)); + // reload + if (this.repositories.isEmpty()) { + // disable control if necessary + if (this.cbxRepository.getEnabled()) { + this.cbxRepository.setEnabled(false); + } + } else if (this.repositories.size() == 1) { + this.repository = this.repositories.get(0); + this.cbxRepository.add(this.repository.getName()); + this.cbxRepository.select(0); - if (getControl().isVisible()) { - MessageDialog.openError(getShell(), RestClientI18n.errorDialogTitle.text(), msg); - } - } - } + // enable control if necessary + if (!this.cbxRepository.getEnabled()) { + this.cbxRepository.setEnabled(true); + } + } else { + // add an item for each repository + for (Repository repository : this.repositories) { + this.cbxRepository.add(repository.getName()); + } - // clear items - this.cbxWorkspace.removeAll(); + // enable control if necessary + if (!this.cbxRepository.getEnabled()) { + this.cbxRepository.setEnabled(true); + } + } - // reload - if (this.workspaces.isEmpty()) { - // disable control if necessary - if (this.cbxWorkspace.getEnabled()) { - this.cbxWorkspace.setEnabled(false); - } - } else if (this.workspaces.size() == 1) { - this.workspace = this.workspaces.get(0); - this.cbxWorkspace.add(this.workspace.getName()); - this.cbxWorkspace.select(0); + // must reload workspaces + refreshWorkspaces(); + } - // enable control if necessary - if (!this.cbxWorkspace.getEnabled()) { - this.cbxWorkspace.setEnabled(true); - } - } else { - // add an item for each workspace - for (Workspace workspace : this.workspaces) { - this.cbxWorkspace.add(workspace.getName()); - } + /** + * Refreshes the server-related fields and controls based on the server + * registry. This in turn causes the repositories and workspaces to also to + * be refreshed. + */ + void refreshServers() { + this.server = null; + this.servers = new ArrayList<Server>(getServerManager().getServers()); - // enable control if necessary - if (!this.cbxWorkspace.getEnabled()) { - this.cbxWorkspace.setEnabled(true); - } - } - } + // clear server combo + this.cbxServer.removeAll(); - /** - * {@inheritDoc} - * - * @see org.jboss.tools.modeshape.rest.IServerRegistryListener#serverRegistryChanged(org.jboss.tools.modeshape.rest.ServerRegistryEvent) - */ - @Override - public Exception[] serverRegistryChanged( ServerRegistryEvent event ) { - // should only be a new server event - if (event.isNew()) { - refreshServers(); - updateState(); - } + if (this.servers.size() == 0) { + // disable control if necessary + if (this.cbxServer.getEnabled()) { + this.cbxServer.setEnabled(false); + } + } else if (this.servers.size() == 1) { + this.server = this.servers.get(0); + this.cbxServer.add(this.server.getName()); + this.cbxServer.select(0); - return null; - } + // enable control if necessary + if (!this.cbxServer.getEnabled()) { + this.cbxServer.setEnabled(true); + } + } else { + // add an item for each server + for (Server server : this.servers) { + this.cbxServer.add(server.getName()); + } - /** - * {@inheritDoc} - * - * @see org.eclipse.jface.dialogs.DialogPage#setVisible(boolean) - */ - @Override - public void setVisible( boolean visible ) { - super.setVisible(visible); + // enable control if necessary + if (!this.cbxServer.getEnabled()) { + this.cbxServer.setEnabled(true); + } + } - if (visible) { - // set initial status - validate(); + // must reload repositories + refreshRepositories(); + } - // update OK/Finish button enablement - setPageComplete(!this.status.isError()); + /** + * Refreshes the workspace-related fields and controls based on the server + * registry. + */ + private void refreshWorkspaces() { + this.workspace = null; - // set initial message - if (this.status.isOk()) { - String msg = ((this.type == Type.PUBLISH) ? RestClientI18n.publishPagePublishOkStatusMsg.text() - : RestClientI18n.publishPageUnpublishOkStatusMsg.text()); - setMessage(msg, IMessageProvider.NONE); - } else { - setMessage(this.status.getMessage(), IMessageProvider.ERROR); - } - } - } + if (this.repository == null) { + this.workspaces = Collections.emptyList(); + } else { + try { + this.workspaces = new ArrayList<Workspace>(getServerManager().getWorkspaces(this.repository)); + } catch (Exception e) { + this.workspaces = Collections.emptyList(); + String msg = RestClientI18n.serverManagerGetWorkspacesExceptionMsg.text(this.repository); + Activator.getDefault().log(new Status(Severity.ERROR, msg, e)); + } + } - /** - * {@inheritDoc} - * - * @see org.eclipse.jface.wizard.WizardPage#setWizard(org.eclipse.jface.wizard.IWizard) - */ - @Override - public void setWizard( IWizard newWizard ) { - super.setWizard(newWizard); + // clear items + this.cbxWorkspace.removeAll(); + this.cbxWorkspaceAreas.removeAll(); - try { - this.files = processResources(this.resources, isRecursing(), this.filter); - } catch (CoreException e) { - Activator.getDefault().log(new Status(Severity.ERROR, RestClientI18n.publishPageRecurseProcessingErrorMsg.text(), e)); - } - } + // reload + if (this.workspaces.isEmpty()) { + // disable controls if necessary + if (this.cbxWorkspace.getEnabled()) { + this.cbxWorkspace.setEnabled(false); + } - /** - * Updates the initial page message. - */ - void updateInitialMessage() { - String msg = ((this.type == Type.PUBLISH) ? RestClientI18n.publishPagePublishOkStatusMsg.text() - : RestClientI18n.publishPageUnpublishOkStatusMsg.text()); + if (this.cbxWorkspaceAreas.getEnabled()) { + this.cbxWorkspaceAreas.setEnabled(false); + } + } else if (this.workspaces.size() == 1) { + Workspace temp = this.workspaces.get(0); + this.cbxWorkspace.add(temp.getName()); + this.cbxWorkspace.select(0); - if (msg.equals(getMessage())) { - updateState(); - } - } + // enable controls if necessary + if (!this.cbxWorkspace.getEnabled()) { + this.cbxWorkspace.setEnabled(true); + } - /** - * Updates message, message icon, and OK button enablement based on validation results - */ - void updateState() { - // get the current state - validate(); + if (!this.cbxWorkspaceAreas.getEnabled()) { + this.cbxWorkspaceAreas.setEnabled(true); + } + } else { + // add an item for each workspace + for (Workspace workspace : this.workspaces) { + this.cbxWorkspace.add(workspace.getName()); + } - // update OK/Finish button enablement - setPageComplete(!this.status.isError()); + // enable controls if necessary + if (!this.cbxWorkspace.getEnabled()) { + this.cbxWorkspace.setEnabled(true); + } - // update page message - if (this.status.isError()) { - setMessage(this.status.getMessage(), IMessageProvider.ERROR); - } else { - if (this.status.isWarning()) { - setMessage(this.status.getMessage(), IMessageProvider.WARNING); - } else if (this.status.isInfo()) { - setMessage(this.status.getMessage(), IMessageProvider.INFORMATION); - } else { - setMessage(this.status.getMessage(), IMessageProvider.NONE); - } - } - } + if (!this.cbxWorkspaceAreas.getEnabled()) { + this.cbxWorkspaceAreas.setEnabled(true); + } + } + } - /** - * Validates all inputs and sets the validation status. - */ - private void validate() { - String msg = null; - Severity severity = Severity.ERROR; + /** + * {@inheritDoc} + * + * @see org.jboss.tools.modeshape.rest.IServerRegistryListener#serverRegistryChanged(org.jboss.tools.modeshape.rest.ServerRegistryEvent) + */ + @Override + public Exception[] serverRegistryChanged(ServerRegistryEvent event) { + // should only be a new server event + if (event.isNew()) { + refreshServers(); + updateState(); + } - if ((this.resources == null) || this.resources.isEmpty() || this.files.isEmpty()) { - msg = ((type == Type.PUBLISH) ? RestClientI18n.publishPageNoResourcesToPublishStatusMsg.text() - : RestClientI18n.publishPageNoResourcesToUnpublishStatusMsg.text()); - } else if (this.server == null) { - int count = this.cbxServer.getItemCount(); - msg = ((count == 0) ? RestClientI18n.publishPageNoAvailableServersStatusMsg.text() - : RestClientI18n.publishPageMissingServerStatusMsg.text()); - } else if (this.repository == null) { - int count = this.cbxRepository.getItemCount(); - msg = ((count == 0) ? RestClientI18n.publishPageNoAvailableRepositoriesStatusMsg.text() - : RestClientI18n.publishPageMissingRepositoryStatusMsg.text()); - } else if (this.workspace == null) { - int count = this.cbxWorkspace.getItemCount(); - msg = ((count == 0) ? RestClientI18n.publishPageNoAvailableWorkspacesStatusMsg.text() - : RestClientI18n.publishPageMissingWorkspaceStatusMsg.text()); - } else { - severity = Severity.OK; - msg = ((type == Type.PUBLISH) ? RestClientI18n.publishPagePublishOkStatusMsg.text() - : RestClientI18n.publishPageUnpublishOkStatusMsg.text()); - } + return null; + } - this.status = new Status(severity, msg, null); - } + /** + * {@inheritDoc} + * + * @see org.eclipse.jface.dialogs.DialogPage#setVisible(boolean) + */ + @Override + public void setVisible(boolean visible) { + super.setVisible(visible); - /** - * Processing done after wizard is finished. Wizard was not canceled. - */ - void wizardFinished() { - // update dialog settings - getDialogSettings().put(RECURSE_KEY, this.recurse); - getDialogSettings().put(WORKSPACE_AREA_KEY, this.workspaceArea); - } + if (visible) { + // set initial status + validate(); + // update OK/Finish button enablement + setPageComplete(!this.status.isError()); + + // set initial message + if (this.status.isOk()) { + String msg = ((this.type == Type.PUBLISH) ? RestClientI18n.publishPagePublishOkStatusMsg.text() + : RestClientI18n.publishPageUnpublishOkStatusMsg.text()); + setMessage(msg, IMessageProvider.NONE); + } else { + setMessage(this.status.getMessage(), IMessageProvider.ERROR); + } + } + } + + /** + * {@inheritDoc} + * + * @see org.eclipse.jface.wizard.WizardPage#setWizard(org.eclipse.jface.wizard.IWizard) + */ + @Override + public void setWizard(IWizard newWizard) { + super.setWizard(newWizard); + + try { + this.files = processResources(this.resources, isRecursing(), this.filter); + } catch (CoreException e) { + Activator.getDefault().log( + new Status(Severity.ERROR, RestClientI18n.publishPageRecurseProcessingErrorMsg.text(), e)); + } + } + + /** + * Updates the initial page message. + */ + void updateInitialMessage() { + String msg = ((this.type == Type.PUBLISH) ? RestClientI18n.publishPagePublishOkStatusMsg.text() + : RestClientI18n.publishPageUnpublishOkStatusMsg.text()); + + if (msg.equals(getMessage())) { + updateState(); + } + } + + /** + * Updates message, message icon, and OK button enablement based on + * validation results + */ + void updateState() { + // get the current state + validate(); + + // update OK/Finish button enablement + setPageComplete(!this.status.isError()); + + // update page message + if (this.status.isError()) { + setMessage(this.status.getMessage(), IMessageProvider.ERROR); + } else { + if (this.status.isWarning()) { + setMessage(this.status.getMessage(), IMessageProvider.WARNING); + } else if (this.status.isInfo()) { + setMessage(this.status.getMessage(), IMessageProvider.INFORMATION); + } else { + setMessage(this.status.getMessage(), IMessageProvider.NONE); + } + } + } + + /** + * Validates all inputs and sets the validation status. + */ + private void validate() { + String msg = null; + Severity severity = Severity.ERROR; + + if ((this.resources == null) || this.resources.isEmpty() || this.files.isEmpty()) { + msg = ((type == Type.PUBLISH) ? RestClientI18n.publishPageNoResourcesToPublishStatusMsg.text() + : RestClientI18n.publishPageNoResourcesToUnpublishStatusMsg.text()); + } else if (this.server == null) { + int count = this.cbxServer.getItemCount(); + msg = ((count == 0) ? RestClientI18n.publishPageNoAvailableServersStatusMsg.text() + : RestClientI18n.publishPageMissingServerStatusMsg.text()); + } else if (this.repository == null) { + int count = this.cbxRepository.getItemCount(); + msg = ((count == 0) ? RestClientI18n.publishPageNoAvailableRepositoriesStatusMsg.text() + : RestClientI18n.publishPageMissingRepositoryStatusMsg.text()); + } else if (this.workspace == null) { + int count = this.cbxWorkspace.getItemCount(); + msg = ((count == 0) ? RestClientI18n.publishPageNoAvailableWorkspacesStatusMsg.text() + : RestClientI18n.publishPageMissingWorkspaceStatusMsg.text()); + } else { + severity = Severity.OK; + msg = ((type == Type.PUBLISH) ? RestClientI18n.publishPagePublishOkStatusMsg.text() + : RestClientI18n.publishPageUnpublishOkStatusMsg.text()); + } + + this.status = new Status(severity, msg, null); + } + + /** + * Processing done after wizard is finished. Wizard was not canceled. + */ + void wizardFinished() { + // update dialog settings + getDialogSettings().put(RECURSE_KEY, this.recurse); + getDialogSettings().put(WORKSPACE_AREA_KEY, this.workspaceArea); + } + } Modified: branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/wizards/PublishWizard.java =================================================================== --- branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/wizards/PublishWizard.java 2011-04-04 13:59:30 UTC (rev 30267) +++ branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/wizards/PublishWizard.java 2011-04-04 14:26:19 UTC (rev 30268) @@ -12,7 +12,9 @@ package org.jboss.tools.modeshape.rest.wizards; import static org.jboss.tools.modeshape.rest.IUiConstants.WIZARD_BANNER_IMAGE; + import java.util.List; + import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; @@ -33,10 +35,6 @@ */ public final class PublishWizard extends Wizard { - // =========================================================================================================================== - // Fields - // =========================================================================================================================== - /** * The wizard page containing all the controls that allow publishing/unpublishing of resources. */ @@ -52,10 +50,6 @@ */ private final Type type; - // =========================================================================================================================== - // Constructors - // =========================================================================================================================== - /** * @param type the publishing or unpublishing indicator (never <code>null</code>) * @param resources the resources being published or unpublished (never <code>null</code>) @@ -65,9 +59,9 @@ public PublishWizard( Type type, List<IResource> resources, ServerManager serverManager ) throws CoreException { - CheckArg.isNotNull(type, "type"); - CheckArg.isNotNull(resources, "resources"); - CheckArg.isNotNull(serverManager, "serverManager"); + CheckArg.isNotNull(type, "type"); //$NON-NLS-1$ + CheckArg.isNotNull(resources, "resources"); //$NON-NLS-1$ + CheckArg.isNotNull(serverManager, "serverManager"); //$NON-NLS-1$ this.type = type; this.page = new PublishPage(type, resources); @@ -78,10 +72,6 @@ setDefaultPageImageDescriptor(Activator.getDefault().getImageDescriptor(WIZARD_BANNER_IMAGE)); } - // =========================================================================================================================== - // Methods - // =========================================================================================================================== - /** * {@inheritDoc} * @@ -141,7 +131,7 @@ Workspace workspace = this.page.getWorkspace(); List<IFile> files = this.page.getFiles(); String workspaceArea = this.page.getWorkspaceArea(); - PublishJob job = new PublishJob(this.type, files, workspace, workspaceArea); + PublishJob job = new PublishJob(this.type, files, workspace, workspaceArea, this.page.isVersioning()); job.schedule(); return true; Modified: branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/wizards/ServerPage.java =================================================================== --- branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/wizards/ServerPage.java 2011-04-04 13:59:30 UTC (rev 30267) +++ branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/wizards/ServerPage.java 2011-04-04 14:26:19 UTC (rev 30268) @@ -12,7 +12,7 @@ package org.jboss.tools.modeshape.rest.wizards; import static org.jboss.tools.modeshape.rest.IUiConstants.BLANK_IMAGE; -import static org.jboss.tools.modeshape.rest.IUiConstants.SERVER_DIALOG_HELP_CONTEXT; +import static org.jboss.tools.modeshape.rest.IUiConstants.HelpContexts.SERVER_DIALOG_HELP_CONTEXT; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.IMessageProvider; @@ -49,10 +49,6 @@ */ public final class ServerPage extends WizardPage { - // =========================================================================================================================== - // Fields - // =========================================================================================================================== - /** * The button used to test the connection to the server. Should only be enabled when server properties are valid. */ @@ -88,10 +84,6 @@ */ private String user; - // =========================================================================================================================== - // Constructors - // =========================================================================================================================== - /** * Constructs a wizard page that will create a new server. */ @@ -117,10 +109,6 @@ this.savePassword = server.isPasswordBeingPersisted(); } - // =========================================================================================================================== - // Methods - // =========================================================================================================================== - private void constructAuthenticationPanel( Composite parent ) { Group pnl = new Group(parent, SWT.NONE); pnl.setText(RestClientI18n.serverPageAuthenticationGroupTitle.text()); @@ -501,10 +489,10 @@ Server changedServer = getServer(); // don't check if modifying existing server and identifying properties have not changed - if (((this.server == null) || !this.server.hasSameKey(changedServer)) - && getServerManager().isRegistered(changedServer)) { + if (((this.server == null) || !this.server.hasSameKey(changedServer)) && getServerManager().isRegistered(changedServer)) { this.status = new Status(Severity.ERROR, - RestClientI18n.serverExistsMsg.text(changedServer.getShortDescription()), null); + RestClientI18n.serverExistsMsg.text(changedServer.getShortDescription()), + null); } } } Modified: branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/wizards/ServerWizard.java =================================================================== --- branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/wizards/ServerWizard.java 2011-04-04 13:59:30 UTC (rev 30267) +++ branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/wizards/ServerWizard.java 2011-04-04 14:26:19 UTC (rev 30268) @@ -12,6 +12,7 @@ package org.jboss.tools.modeshape.rest.wizards; import static org.jboss.tools.modeshape.rest.IUiConstants.WIZARD_BANNER_IMAGE; + import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.wizard.Wizard; import org.jboss.tools.modeshape.rest.Activator; @@ -25,10 +26,6 @@ */ public final class ServerWizard extends Wizard { - // =========================================================================================================================== - // Fields - // =========================================================================================================================== - /** * Non-<code>null</code> if the wizard is editing an existing server. */ @@ -44,10 +41,6 @@ */ private final ServerManager serverManager; - // =========================================================================================================================== - // Constructors - // =========================================================================================================================== - /** * Constructs a wizard that creates a new server. * @@ -72,13 +65,11 @@ this.page = new ServerPage(server); this.serverManager = serverManager; this.existingServer = server; + + setDefaultPageImageDescriptor(Activator.getDefault().getImageDescriptor(WIZARD_BANNER_IMAGE)); setWindowTitle(RestClientI18n.serverWizardEditServerTitle.text()); } - // =========================================================================================================================== - // Methods - // =========================================================================================================================== - /** * {@inheritDoc} * Added: branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/slf4j/impl/StaticLoggerBinder.java =================================================================== --- branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/slf4j/impl/StaticLoggerBinder.java (rev 0) +++ branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/slf4j/impl/StaticLoggerBinder.java 2011-04-04 14:26:19 UTC (rev 30268) @@ -0,0 +1,62 @@ +/* + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. + * + * This software is made available by Red Hat, Inc. under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution and is + * available at http://www.eclipse.org/legal/epl-v10.html. + * + * See the AUTHORS.txt file in the distribution for a full listing of + * individual contributors. + */ +package org.slf4j.impl; + +import org.jboss.tools.modeshape.rest.log.EclipseLoggerFactory; +import org.slf4j.ILoggerFactory; +import org.slf4j.spi.LoggerFactoryBinder; + +public final class StaticLoggerBinder implements LoggerFactoryBinder { + + /** + * The class name of the logger factory. + */ + private static final String LOGGER_FACTORY_CLASS_NAME = EclipseLoggerFactory.class.getName(); + + /** + * The unique instance of this class. + */ + private static final StaticLoggerBinder SINGLETON = new StaticLoggerBinder(); + + /** + * @return the static instance of the logger + */ + public static final StaticLoggerBinder getSingleton() { + return SINGLETON; + } + + /** + * The logger factory used. + */ + private final ILoggerFactory loggerFactory = new EclipseLoggerFactory(); + + /** + * {@inheritDoc} + * + * @see org.slf4j.spi.LoggerFactoryBinder#getLoggerFactory() + */ + @Override + public ILoggerFactory getLoggerFactory() { + return this.loggerFactory; + } + + /** + * {@inheritDoc} + * + * @see org.slf4j.spi.LoggerFactoryBinder#getLoggerFactoryClassStr() + */ + @Override + public String getLoggerFactoryClassStr() { + return LOGGER_FACTORY_CLASS_NAME; + } + +} Property changes on: branches/jbosstools-3.2.x/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/slf4j/impl/StaticLoggerBinder.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: branches/jbosstools-3.2.x/modeshape/tests/org.jboss.tools.modeshape.rest.test/src/org/jboss/tools/modeshape/rest/MockRestClient.java =================================================================== --- branches/jbosstools-3.2.x/modeshape/tests/org.jboss.tools.modeshape.rest.test/src/org/jboss/tools/modeshape/rest/MockRestClient.java 2011-04-04 13:59:30 UTC (rev 30267) +++ branches/jbosstools-3.2.x/modeshape/tests/org.jboss.tools.modeshape.rest.test/src/org/jboss/tools/modeshape/rest/MockRestClient.java 2011-04-04 14:26:19 UTC (rev 30268) @@ -16,7 +16,9 @@ import java.util.Collection; import java.util.List; import java.util.Map; + import javax.jcr.nodetype.NodeType; + import org.modeshape.web.jcr.rest.client.IRestClient; import org.modeshape.web.jcr.rest.client.Status; import org.modeshape.web.jcr.rest.client.domain.QueryRow; @@ -84,6 +86,19 @@ /** * {@inheritDoc} * + * @see org.modeshape.web.jcr.rest.client.IRestClient#publish(org.modeshape.web.jcr.rest.client.domain.Workspace, + * java.lang.String, java.io.File, boolean) + */ + public Status publish( Workspace workspace, + String path, + File file, + boolean version ) { + return null; + } + + /** + * {@inheritDoc} + * * @see org.modeshape.web.jcr.rest.client.IRestClient#unpublish(org.modeshape.web.jcr.rest.client.domain.Workspace, * java.lang.String, java.io.File) */