[jboss-svn-commits] JBL Code SVN: r22419 - in labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools: src/org/guvnor/tools and 9 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Sep 4 14:15:32 EDT 2008
Author: john.graham at jboss.org
Date: 2008-09-04 14:15:32 -0400 (Thu, 04 Sep 2008)
New Revision: 22419
Modified:
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/META-INF/MANIFEST.MF
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/GuvnorLocationManager.java
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/GuvnorRepository.java
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/Messages.java
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/ResourceChangeListener.java
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/actions/AddAction.java
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/actions/CommitAction.java
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/actions/DeleteAction.java
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/actions/DisconnectAction.java
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/actions/ShowHistoryAction.java
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/actions/SwitchVersionAction.java
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/actions/UpdateAction.java
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/messages.properties
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/perspectives/GuvnorRepExplorerPerspective.java
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/preferences/IGuvnorPreferenceConstants.java
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/properties/GuvnorWorkspaceFilePage.java
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/properties/RepositoryElementPropsDialog.java
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/ActionUtils.java
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/AuthenticationPromptDialog.java
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/GuvnorMetadataUtils.java
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/StringInput.java
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/StringStorage.java
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/VersionChooserDialog.java
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/webdav/DebugHttpClient.java
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/webdav/ResourceProperties.java
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/webdav/StreamProcessingUtils.java
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/webdav/WebDavAuthenticator.java
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/webdav/WebDavException.java
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/webdav/WebDavSessionAuthenticator.java
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/views/IGuvnorConstants.java
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/views/RepositoryContentProvider.java
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/views/RepositoryLabelProvider.java
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/views/RepositoryView.java
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/views/ResourceHistoryView.java
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/views/model/TreeObject.java
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/views/model/TreeParent.java
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/AddResourceWizard.java
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/CheckoutWizard.java
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/GuvWizNewProjectPage.java
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/GuvWizardModel.java
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/GuvnorMainConfigPage.java
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/IGuvnorWizard.java
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/NewRepLocationWizard.java
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/SelectGuvnorFolderPage.java
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/SelectGuvnorRepPage.java
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/SelectGuvnorResourcesPage.java
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/SelectLocalTargetPage.java
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/SelectResourceVersionPage.java
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/WizardUtils.java
Log:
Clean up externalization; use MessageFormat where appropriate
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/META-INF/MANIFEST.MF 2008-09-04 18:14:33 UTC (rev 22418)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/META-INF/MANIFEST.MF 2008-09-04 18:15:32 UTC (rev 22419)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %plugin.name
Bundle-SymbolicName: org.guvnor.tools;singleton:=true
-Bundle-Version: 0.9.0.200809031608
+Bundle-Version: 0.9.0.200809041215
Bundle-Activator: org.guvnor.tools.Activator
Bundle-Vendor: %plugin.provider
Bundle-Localization: plugin
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/GuvnorLocationManager.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/GuvnorLocationManager.java 2008-09-04 18:14:33 UTC (rev 22418)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/GuvnorLocationManager.java 2008-09-04 18:15:32 UTC (rev 22419)
@@ -13,6 +13,10 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Platform;
+/**
+ * Reads and writes Guvnor location information to disk.
+ * @author jgraham
+ */
public class GuvnorLocationManager {
private static final String REP_CACHE_NAME = ".replist"; //$NON-NLS-1$
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/GuvnorRepository.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/GuvnorRepository.java 2008-09-04 18:14:33 UTC (rev 22418)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/GuvnorRepository.java 2008-09-04 18:15:32 UTC (rev 22419)
@@ -1,5 +1,9 @@
package org.guvnor.tools;
+/**
+ * A simple representation of a Guvnor repository.
+ * @author jgraham
+ */
public class GuvnorRepository {
private String location;
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/Messages.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/Messages.java 2008-09-04 18:14:33 UTC (rev 22418)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/Messages.java 2008-09-04 18:15:32 UTC (rev 22419)
@@ -3,6 +3,10 @@
import java.util.MissingResourceException;
import java.util.ResourceBundle;
+/**
+ * Auto-generated class for dealing with externalized strings.
+ * @author jgraham
+ */
public class Messages {
private static final String BUNDLE_NAME = "org.guvnor.tools.messages"; //$NON-NLS-1$
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/ResourceChangeListener.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/ResourceChangeListener.java 2008-09-04 18:14:33 UTC (rev 22418)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/ResourceChangeListener.java 2008-09-04 18:15:32 UTC (rev 22419)
@@ -19,6 +19,10 @@
import org.guvnor.tools.utils.GuvnorMetadataUtils;
import org.guvnor.tools.utils.PlatformUtils;
+/**
+ * Updates local Guvnor properties when changes occur in the Eclipse workspace.
+ * @author jgraham
+ */
public class ResourceChangeListener implements IResourceChangeListener {
public void resourceChanged(IResourceChangeEvent event) {
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/actions/AddAction.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/actions/AddAction.java 2008-09-04 18:14:33 UTC (rev 22418)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/actions/AddAction.java 2008-09-04 18:15:32 UTC (rev 22419)
@@ -11,6 +11,10 @@
import org.guvnor.tools.utils.PlatformUtils;
import org.guvnor.tools.wizards.AddResourceWizard;
+/**
+ * Adds a new resource to Guvnor.
+ * @author jgraham
+ */
public class AddAction implements IObjectActionDelegate {
private IStructuredSelection selectedItems;
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/actions/CommitAction.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/actions/CommitAction.java 2008-09-04 18:14:33 UTC (rev 22418)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/actions/CommitAction.java 2008-09-04 18:15:32 UTC (rev 22419)
@@ -12,6 +12,10 @@
import org.guvnor.tools.utils.GuvnorMetadataUtils;
import org.guvnor.tools.utils.PlatformUtils;
+/**
+ * Commits changes to Guvnor resources.
+ * @author jgraham
+ */
public class CommitAction implements IObjectActionDelegate {
private IStructuredSelection selectedItems;
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/actions/DeleteAction.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/actions/DeleteAction.java 2008-09-04 18:14:33 UTC (rev 22418)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/actions/DeleteAction.java 2008-09-04 18:15:32 UTC (rev 22419)
@@ -1,6 +1,7 @@
package org.guvnor.tools.actions;
import java.net.URL;
+import java.text.MessageFormat;
import java.util.Iterator;
import org.eclipse.core.resources.IFile;
@@ -23,6 +24,10 @@
import org.guvnor.tools.utils.webdav.WebDavException;
import org.guvnor.tools.utils.webdav.WebDavServerCache;
+/**
+ * Deletes a resource in Guvnor.
+ * @author jgraham
+ */
public class DeleteAction implements IObjectActionDelegate {
private IStructuredSelection selectedItems;
@@ -53,10 +58,11 @@
}
String msg = null;
if (selectedItems.size() == 1) {
- msg = Messages.getString("delete.singlefile.confirmation.prefix") + //$NON-NLS-1$
- ((IFile)selectedItems.getFirstElement()).getName() + Messages.getString("delete.singlefile.confirmation.suffix"); //$NON-NLS-1$
+ msg = MessageFormat.format(Messages.getString("delete.singlefile.confirmation"), //$NON-NLS-1$
+ new Object[] { ((IFile)selectedItems.getFirstElement()).getName() });
} else {
- msg = Messages.getString("delete.multifile.confirmation.prefix") + selectedItems.size() + Messages.getString("delete.multifile.confirmation.suffix"); //$NON-NLS-1$ //$NON-NLS-2$
+ msg = MessageFormat.format(Messages.getString("delete.multifile.confirmation"), //$NON-NLS-1$
+ new Object[] { String.valueOf(selectedItems.size()) });
}
if (!MessageDialog.openConfirm(targetPart.getSite().getShell(),
Messages.getString("delete.confirmation.dialog.caption"), msg)) { //$NON-NLS-1$
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/actions/DisconnectAction.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/actions/DisconnectAction.java 2008-09-04 18:14:33 UTC (rev 22418)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/actions/DisconnectAction.java 2008-09-04 18:15:32 UTC (rev 22419)
@@ -18,6 +18,10 @@
import org.guvnor.tools.utils.GuvnorMetadataUtils;
import org.guvnor.tools.utils.PlatformUtils;
+/**
+ * Disconnects a local resource from its association with Guvnor.
+ * @author jgraham
+ */
public class DisconnectAction implements IObjectActionDelegate {
private IStructuredSelection selectedItems;
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/actions/ShowHistoryAction.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/actions/ShowHistoryAction.java 2008-09-04 18:14:33 UTC (rev 22418)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/actions/ShowHistoryAction.java 2008-09-04 18:15:32 UTC (rev 22419)
@@ -25,6 +25,10 @@
import org.guvnor.tools.views.ResourceHistoryView;
import org.guvnor.tools.views.model.TreeObject;
+/**
+ * Shows the revision history for a given resource.
+ * @author jgraham
+ */
public class ShowHistoryAction implements IObjectActionDelegate {
private IFile selectedFile;
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/actions/SwitchVersionAction.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/actions/SwitchVersionAction.java 2008-09-04 18:14:33 UTC (rev 22418)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/actions/SwitchVersionAction.java 2008-09-04 18:15:32 UTC (rev 22419)
@@ -25,6 +25,10 @@
import org.guvnor.tools.utils.webdav.WebDavServerCache;
import org.guvnor.tools.views.model.ResourceHistoryEntry;
+/**
+ * Switches to a specific revision of a given resource.
+ * @author jgraham
+ */
public class SwitchVersionAction implements IObjectActionDelegate {
private IFile selectedFile;
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/actions/UpdateAction.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/actions/UpdateAction.java 2008-09-04 18:14:33 UTC (rev 22418)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/actions/UpdateAction.java 2008-09-04 18:15:32 UTC (rev 22419)
@@ -24,6 +24,10 @@
import org.guvnor.tools.utils.webdav.WebDavException;
import org.guvnor.tools.utils.webdav.WebDavServerCache;
+/**
+ * Updates a local resource with the latest contents from Guvnor.
+ * @author jgraham
+ */
public class UpdateAction implements IObjectActionDelegate {
private IStructuredSelection selectedItems;
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/messages.properties
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/messages.properties 2008-09-04 18:14:33 UTC (rev 22418)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/messages.properties 2008-09-04 18:15:32 UTC (rev 22419)
@@ -1,35 +1,33 @@
-10=show_revision
-11=show_datetime
-9=show_change_indicator
action.add.rep=Add
-action.add.rep.desc=Add a Guvnor respository location
+action.add.rep.desc=Add a Guvnor respository connection
action.delete.rep=Delete
-action.delete.rep.desc=Delete Guvnor repository location
+action.delete.rep.desc=Delete Guvnor repository connection
action.open=Open (read-only)
action.open.desc=Opens a read-only editor with the version contents
action.refresh.rep=Refresh
action.refresh.rep.desc=Refreshes the current node and its children
-alreadfy.exists=\ already exists
-already.exists=\ already exists in folder
+add.failure=Could not add {0} to {1}
+already.exists={0} already exists
+already.exists.folder={0} already exists in {1}
+already.guvnor.as={0} is already in Guvnor as {1}
bottom.left=Bottom left
bottom.right=Bottom right
copy.of=CopyOf
delete.confirmation.dialog.caption=Confirm Delete
-delete.multifile.confirmation.prefix=Delete these
-delete.multifile.confirmation.suffix=\ resources in Guvnor?
-delete.singlefile.confirmation.prefix=Delete
-delete.singlefile.confirmation.suffix=\ in Guvnor?
+delete.multifile.confirmation=Delete these {0} resources in Guvnor?
+delete.singlefile.confirmation=Delete {0} in Guvnor?
error=Error
-guvnor.repository.element=Guvnor Repository Element
-guvnor.resource.properties=Properties for element:
+guvnor.repository.element=Guvnor Resource Properties
+guvnor.resource.properties=Properties for {0}
+guvnor.resource.property={0}:
history.author=Author
history.comment=Comment
history.date=Date
history.rep.label=Repository:
-history.resource.label=Resource:
+history.resource.label=Resource: {0}
history.revision=Revision
login.dialog.caption=Guvnor Repository Log in
-login.dialog.desc=Authentication required for repository:
+login.dialog.desc=Authentication required for repository: {0}
login.failure.dialog.caption=Guvnor Repository Log in
login.failure.dialog.message=Authentication failure
mainconfig.guvnor.loc=Location:
@@ -37,28 +35,22 @@
mainconfig.port=Port:
mainconfig.rep=Repository:
mainconfig.save.password=Save user name and password
-mainconfig.save.password.warning=NOTE: Saved passwords are stored on your computer in a file that is difficult, but not impossible, for an intruder to read.
mainconfig.user.name=User Name:
name.conflict=Name Conflict
-name.conflict.request=Enter a new name for
-new.guvnor.loc=New Guvnor location
+name.conflict.request=Enter a new name for {0}
+new.guvnor.loc=New Guvnor connection
new.guvnor.loc.desc=Create a new Guvnor repository connection
-new.guvnor.rep=New Guvnor repository location
+new.guvnor.rep=New Guvnor repository connection
new.guvnor.rep.desc=Creates a connection to a Guvnor repository
-new.guvnor.rep.loc=New Guvnor repository location
+new.guvnor.rep.loc=New Guvnor repository connection
new.guvnor.rep.loc.desc=Creates a connection to a Guvnor repository
no.overlay=<None>
not.guvnor.associated=(Not associated with Guvnor)
overwrite.confirmation.caption=Revision Conflict
-overwrite.confirmation.infix=\ is
-overwrite.confirmation.prefix=The Guvnor revision for
-overwrite.confirmation.question=.\r\nOverwrite Guvnor repository revision with current local file contents?
-overwrite.confirmation.suffix=, but the local copy is based on revision
-password=Password:
-password=Password:
+overwrite.confirmation=The Guvnor revision for {0} is {1}, but the local copy is based on revision {2}.\r\nOverwrite Guvnor repository revision with current local file contents?
+password=Password:
password.warning=NOTE: Saved passwords are stored on your computer in a file that is difficult, but not impossible, for an intruder to read.
pending=Pending...
-pending=Pending...
prepage.decoration.location=Icon decoration location:
prepage.decoration.text=Text
prepage.file.decoration=File Decoration
@@ -79,8 +71,8 @@
prop.type=Type
properties.basic=Basic
properties.security=Security
-remove.rep.dialog.caption=Remove repository location
-remove.rep.dialog.msg=Confirm removing
+remove.rep.dialog.caption=Remove repository connection
+remove.rep.dialog.msg=Confirm removing {0}
repository.label=Repository:
repository.path=Path:
repository.resource.revision=Revision:
@@ -90,12 +82,12 @@
select.folder=Select folder:
select.folder.desc=Select the target folder in the Guvnor repository
select.guvnor.rep=Select Guvnor repository location
-select.guvnor.rep.desc=Select an existing Guvnor repository location or create a new one
-select.guvnor.rep.location=Select Guvnor repository location
-select.guvnor.rep.location.desc=Select an existing Guvnor repository location or create a new one
+select.guvnor.rep.desc=Select an existing Guvnor repository connection or create a new one
+select.guvnor.rep.location=Select Guvnor repository connection
+select.guvnor.rep.location.desc=Select an existing Guvnor repository connection or create a new one
select.location=Select location:
-select.rep.guvnor.loc=Create a new Guvnor repository location
-select.rep.guvnor.loc.desc=Use an existing Guvnor repository location
+select.rep.guvnor.loc=Create a new Guvnor repository connection
+select.rep.guvnor.loc.desc=Use an existing Guvnor repository connection
select.resources=Select resources
select.resources=Select resources:
select.resources.desc=Select resources to copy from the Guvnor repository
@@ -105,7 +97,6 @@
top.left=Top left
top.right=Top right
user.name=User Name:
-user.name=User Name:
version.dialog.caption=Resource Versions
-version.dialog.message=Choose a version for
+version.dialog.message=Choose a version for {0}
warning=Warning
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/perspectives/GuvnorRepExplorerPerspective.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/perspectives/GuvnorRepExplorerPerspective.java 2008-09-04 18:14:33 UTC (rev 22418)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/perspectives/GuvnorRepExplorerPerspective.java 2008-09-04 18:15:32 UTC (rev 22419)
@@ -36,8 +36,6 @@
// Add "show views". They will be present in "show view" menu
layout.addShowViewShortcut(IPageLayout.ID_RES_NAV);
layout.addShowViewShortcut(IPageLayout.ID_PROP_SHEET);
-// layout.addShowViewShortcut(IPageLayout.ID_OUTLINE);
-// layout.addShowViewShortcut(IPageLayout.ID_TASK_LIST);
layout.addShowViewShortcut(IGuvnorConstants.RESHISTORYVIEW_ID);
layout.addShowViewShortcut(IGuvnorConstants.REPVIEW_ID);
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/preferences/IGuvnorPreferenceConstants.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/preferences/IGuvnorPreferenceConstants.java 2008-09-04 18:14:33 UTC (rev 22418)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/preferences/IGuvnorPreferenceConstants.java 2008-09-04 18:15:32 UTC (rev 22419)
@@ -31,11 +31,11 @@
public int OVERLAY_LOCATION_DEFAULT = 1;
// Value is a boolean, true by default
- public String SHOW_CHANGE_INDICATOR_PREF = Messages.getString("9"); //$NON-NLS-1$
+ public String SHOW_CHANGE_INDICATOR_PREF = "show_change_indicator"; //$NON-NLS-1$
// Value is a boolean, true by default
- public String SHOW_REVISION_PREF = Messages.getString("10"); //$NON-NLS-1$
+ public String SHOW_REVISION_PREF = "show_revision"; //$NON-NLS-1$
// Value is a boolean, true by default
- public String SHOW_DATETIME_PREF = Messages.getString("11"); //$NON-NLS-1$
+ public String SHOW_DATETIME_PREF = "show_datetime"; //$NON-NLS-1$
}
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/properties/GuvnorWorkspaceFilePage.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/properties/GuvnorWorkspaceFilePage.java 2008-09-04 18:14:33 UTC (rev 22418)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/properties/GuvnorWorkspaceFilePage.java 2008-09-04 18:15:32 UTC (rev 22419)
@@ -14,6 +14,10 @@
import org.guvnor.tools.utils.GuvnorMetadataUtils;
import org.guvnor.tools.utils.PlatformUtils;
+/**
+ * A property page for displaying Guvnor details for a given resource.
+ * @author jgraham
+ */
public class GuvnorWorkspaceFilePage extends PropertyPage implements IWorkbenchPropertyPage {
public GuvnorWorkspaceFilePage() {
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/properties/RepositoryElementPropsDialog.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/properties/RepositoryElementPropsDialog.java 2008-09-04 18:14:33 UTC (rev 22418)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/properties/RepositoryElementPropsDialog.java 2008-09-04 18:15:32 UTC (rev 22419)
@@ -2,6 +2,7 @@
import java.net.MalformedURLException;
import java.net.URL;
+import java.text.MessageFormat;
import java.util.Map;
import org.eclipse.core.runtime.IStatus;
@@ -46,7 +47,8 @@
@Override
protected Control createDialogArea(Composite parent) {
super.setTitle(Messages.getString("guvnor.repository.element")); //$NON-NLS-1$
- super.setMessage(Messages.getString("guvnor.resource.properties") + node.getName()); //$NON-NLS-1$
+ super.setMessage(MessageFormat.format(Messages.getString("guvnor.resource.properties"), //$NON-NLS-1$
+ new Object[] { node.getName() }));
super.setTitleImage(Activator.getImageDescriptor(Activator.IMG_GUVREPWIZBAN).createImage());
TabFolder folder = new TabFolder(parent, SWT.TOP);
@@ -75,7 +77,9 @@
for (int i = 0; i < desc.length; i++) {
if (desc[i] instanceof TextPropertyDescriptor) {
TextPropertyDescriptor oneDesc = (TextPropertyDescriptor)desc[i];
- new Label(composite, SWT.NONE).setText(oneDesc.getDisplayName() + ":"); //$NON-NLS-1$
+ new Label(composite, SWT.NONE).
+ setText(MessageFormat.format(Messages.getString("guvnor.resource.property"), //$NON-NLS-1$
+ new Object[] { oneDesc.getDisplayName() }));
String val = ps.getPropertyValue(oneDesc.getId()) != null?
(String)ps.getPropertyValue(oneDesc.getId()):""; //$NON-NLS-1$
new Label(composite, SWT.NONE).setText(val);
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/ActionUtils.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/ActionUtils.java 2008-09-04 18:14:33 UTC (rev 22418)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/ActionUtils.java 2008-09-04 18:15:32 UTC (rev 22419)
@@ -8,6 +8,10 @@
import org.eclipse.jface.viewers.IStructuredSelection;
import org.guvnor.tools.Activator;
+/**
+ * Convenience methods for actions.
+ * @author jgraham
+ */
public class ActionUtils {
@SuppressWarnings("unchecked")
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/AuthenticationPromptDialog.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/AuthenticationPromptDialog.java 2008-09-04 18:14:33 UTC (rev 22418)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/AuthenticationPromptDialog.java 2008-09-04 18:15:32 UTC (rev 22419)
@@ -1,5 +1,7 @@
package org.guvnor.tools.utils;
+import java.text.MessageFormat;
+
import org.eclipse.jface.dialogs.TitleAreaDialog;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
@@ -50,7 +52,8 @@
@Override
protected Control createDialogArea(Composite parent) {
super.setTitle(Messages.getString("login.dialog.caption")); //$NON-NLS-1$
- super.setMessage(Messages.getString("login.dialog.desc") + serverName); //$NON-NLS-1$
+ super.setMessage(MessageFormat.format(Messages.getString("login.dialog.desc"), //$NON-NLS-1$
+ new Object[] { serverName }));
super.setTitleImage(Activator.getImageDescriptor(Activator.IMG_GUVREPWIZBAN).createImage());
Composite composite = PlatformUtils.createComposite(parent, 2);
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/GuvnorMetadataUtils.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/GuvnorMetadataUtils.java 2008-09-04 18:14:33 UTC (rev 22418)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/GuvnorMetadataUtils.java 2008-09-04 18:15:32 UTC (rev 22419)
@@ -5,6 +5,7 @@
import java.io.FileOutputStream;
import java.io.OutputStream;
import java.net.URL;
+import java.text.MessageFormat;
import java.util.Enumeration;
import java.util.NoSuchElementException;
import java.util.Properties;
@@ -150,10 +151,10 @@
// version for the local copy
boolean proceed = true;
if (!props.getRevision().equals(remoteProps.getRevision())) {
- String msg = Messages.getString("overwrite.confirmation.prefix") + selectedFile.getName() + Messages.getString("overwrite.confirmation.infix") + //$NON-NLS-1$ //$NON-NLS-2$
- remoteProps.getRevision() + Messages.getString("overwrite.confirmation.suffix") + //$NON-NLS-1$
- props.getRevision() +
- Messages.getString("overwrite.confirmation.question"); //$NON-NLS-1$
+ String msg = MessageFormat.format(Messages.getString("overwrite.confirmation"), //$NON-NLS-1$
+ new Object[] { selectedFile.getName(),
+ remoteProps.getRevision(),
+ props.getRevision() });
Display display = PlatformUI.getWorkbench().getDisplay();
proceed = MessageDialog.openQuestion(display.getActiveShell(),
Messages.getString("overwrite.confirmation.caption"), msg); //$NON-NLS-1$
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/StringInput.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/StringInput.java 2008-09-04 18:14:33 UTC (rev 22418)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/StringInput.java 2008-09-04 18:15:32 UTC (rev 22419)
@@ -6,6 +6,10 @@
import org.eclipse.ui.IPersistableElement;
import org.eclipse.ui.IStorageEditorInput;
+/**
+ * A in-memory editor input.
+ * @author jgraham
+ */
public class StringInput extends PlatformObject implements IStorageEditorInput {
private IStorage storage;
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/StringStorage.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/StringStorage.java 2008-09-04 18:14:33 UTC (rev 22418)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/StringStorage.java 2008-09-04 18:15:32 UTC (rev 22419)
@@ -8,6 +8,10 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.PlatformObject;
+/**
+ * Stores a string for in-memory editing.
+ * @author jgraham
+ */
public class StringStorage extends PlatformObject implements IStorage {
private String contents;
private String name;
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/VersionChooserDialog.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/VersionChooserDialog.java 2008-09-04 18:14:33 UTC (rev 22418)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/VersionChooserDialog.java 2008-09-04 18:15:32 UTC (rev 22419)
@@ -1,5 +1,7 @@
package org.guvnor.tools.utils;
+import java.text.MessageFormat;
+
import org.eclipse.jface.dialogs.TitleAreaDialog;
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.IStructuredSelection;
@@ -17,6 +19,10 @@
import org.guvnor.tools.views.ResourceHistoryLabelProvider;
import org.guvnor.tools.views.model.ResourceHistoryEntry;
+/**
+ * Dialog for choosing a Guvnor revision of a selected resource.
+ * @author jgraham
+ */
public class VersionChooserDialog extends TitleAreaDialog {
private static final int INITIAL_WIDTH = 790;
@@ -39,7 +45,8 @@
@Override
protected Control createDialogArea(Composite parent) {
super.setTitle(Messages.getString("version.dialog.caption")); //$NON-NLS-1$
- super.setMessage(Messages.getString("version.dialog.message") + fileName); //$NON-NLS-1$
+ super.setMessage(MessageFormat.format(Messages.getString("version.dialog.message"), //$NON-NLS-1$
+ new Object[] { fileName }));
super.setTitleImage(Activator.getImageDescriptor(Activator.IMG_GUVREPWIZBAN).createImage());
viewer = new TableViewer(PlatformUtils.createResourceHistoryTable(parent));
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/webdav/DebugHttpClient.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/webdav/DebugHttpClient.java 2008-09-04 18:14:33 UTC (rev 22418)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/webdav/DebugHttpClient.java 2008-09-04 18:15:32 UTC (rev 22419)
@@ -6,6 +6,10 @@
import org.eclipse.webdav.http.client.Request;
import org.eclipse.webdav.http.client.Response;
+/**
+ * An intercept client that dumps debug information to System.out.
+ * @author jgraham
+ */
public class DebugHttpClient extends HttpClient {
@Override
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/webdav/ResourceProperties.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/webdav/ResourceProperties.java 2008-09-04 18:14:33 UTC (rev 22418)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/webdav/ResourceProperties.java 2008-09-04 18:15:32 UTC (rev 22419)
@@ -1,5 +1,9 @@
package org.guvnor.tools.utils.webdav;
+/**
+ * Container for Guvnor properties.
+ * @author jgraham
+ */
public class ResourceProperties {
private boolean isDirectory;
private String creationDate;
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/webdav/StreamProcessingUtils.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/webdav/StreamProcessingUtils.java 2008-09-04 18:14:33 UTC (rev 22418)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/webdav/StreamProcessingUtils.java 2008-09-04 18:15:32 UTC (rev 22419)
@@ -12,6 +12,10 @@
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
+/**
+ * Utilities for dealing with streams.
+ * @author jgraham
+ */
public class StreamProcessingUtils {
public static String getStreamContents(InputStream is) throws IOException {
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/webdav/WebDavAuthenticator.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/webdav/WebDavAuthenticator.java 2008-09-04 18:14:33 UTC (rev 22418)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/webdav/WebDavAuthenticator.java 2008-09-04 18:15:32 UTC (rev 22419)
@@ -6,6 +6,10 @@
import org.eclipse.core.runtime.Platform;
import org.eclipse.webdav.http.client.IAuthenticator;
+/**
+ * A WebDav authenticator based on the Eclipse platform key-ring file.
+ * @author jgraham
+ */
public class WebDavAuthenticator implements IAuthenticator {
private URL repLocation;
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/webdav/WebDavException.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/webdav/WebDavException.java 2008-09-04 18:14:33 UTC (rev 22418)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/webdav/WebDavException.java 2008-09-04 18:15:32 UTC (rev 22419)
@@ -2,6 +2,11 @@
import org.eclipse.webdav.IResponse;
+/**
+ * An Exception specifically for WebDav errors. Stores the response code and status message.
+ * @author jgraham
+ *
+ */
public class WebDavException extends Exception {
private static final long serialVersionUID = -2421203349714311291L;
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/webdav/WebDavSessionAuthenticator.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/webdav/WebDavSessionAuthenticator.java 2008-09-04 18:14:33 UTC (rev 22418)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/webdav/WebDavSessionAuthenticator.java 2008-09-04 18:15:32 UTC (rev 22419)
@@ -6,6 +6,11 @@
import org.eclipse.webdav.http.client.IAuthenticator;
+/**
+ * Authenticates based on in-memory credentials, and is limited to the VM session.
+ * @author jgraham
+ *
+ */
public class WebDavSessionAuthenticator implements IAuthenticator {
private class ServerAuthenInfo {
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/views/IGuvnorConstants.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/views/IGuvnorConstants.java 2008-09-04 18:14:33 UTC (rev 22418)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/views/IGuvnorConstants.java 2008-09-04 18:15:32 UTC (rev 22419)
@@ -1,5 +1,10 @@
package org.guvnor.tools.views;
+/**
+ * Id strings for the Guvnor views.
+ * @author jgraham
+ *
+ */
public interface IGuvnorConstants {
public final static String REPVIEW_ID = "org.guvnor.tools.views.RepositoryView"; //$NON-NLS-1$
public static final String RESHISTORYVIEW_ID = "org.guvnor.tools.views.ResourceHistoryView"; //$NON-NLS-1$
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/views/RepositoryContentProvider.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/views/RepositoryContentProvider.java 2008-09-04 18:14:33 UTC (rev 22418)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/views/RepositoryContentProvider.java 2008-09-04 18:15:32 UTC (rev 22419)
@@ -13,6 +13,10 @@
import org.guvnor.tools.views.model.TreeObject;
import org.guvnor.tools.views.model.TreeParent;
+/**
+ * Content provider for representing Guvnor structure.
+ * @author jgraham
+ */
public class RepositoryContentProvider implements IStructuredContentProvider,
ITreeContentProvider {
private TreeParent invisibleRoot;
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/views/RepositoryLabelProvider.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/views/RepositoryLabelProvider.java 2008-09-04 18:14:33 UTC (rev 22418)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/views/RepositoryLabelProvider.java 2008-09-04 18:15:32 UTC (rev 22419)
@@ -10,6 +10,11 @@
import org.guvnor.tools.views.model.TreeParent;
import org.guvnor.tools.views.model.TreeObject.Type;
+/**
+ * Label providers for Guvnor structure.
+ * @author jgraham
+ *
+ */
public class RepositoryLabelProvider extends LabelProvider {
private Image repImage;
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/views/RepositoryView.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/views/RepositoryView.java 2008-09-04 18:14:33 UTC (rev 22418)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/views/RepositoryView.java 2008-09-04 18:15:32 UTC (rev 22419)
@@ -5,6 +5,7 @@
import java.io.PrintWriter;
import java.net.URL;
import java.rmi.server.UID;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.List;
@@ -57,6 +58,10 @@
import org.guvnor.tools.views.model.TreeParent;
import org.guvnor.tools.wizards.NewRepLocationWizard;
+/**
+ * A view showing Guvnor structure in a tree.
+ * @author jgraham
+ */
public class RepositoryView extends ViewPart {
private TreeViewer viewer;
@@ -171,7 +176,7 @@
StringBuilder msg = new StringBuilder();
for (int i = 0; i < errors.length; i++) {
msg.append(errors[i]);
- msg.append("\r\n");
+ msg.append("\r\n"); //$NON-NLS-1$
}
Activator.getDefault().
displayMessage(IStatus.ERROR, msg.toString());
@@ -216,8 +221,9 @@
addResourceToGuvnor(target.getGuvnorRepository().getLocation(),
target.getFullPath(), sourceFile);
if (!res) {
- errors.add("Could not add " + items[i] +
- " to " + target.getFullPath());
+ errors.add(MessageFormat.format(Messages.getString("add.failure"), //$NON-NLS-1$
+ new Object[] { items[i],
+ target.getFullPath() }));
}
} else {
// Need to check if the drop location is the same as the Guvnor
@@ -230,7 +236,9 @@
GuvnorMetadataUtils.commitFileChanges(sourceFile);
}
} else {
- errors.add(items[i] + " is already in Guvnor as " + md.getFullpath());
+ errors.add(MessageFormat.format(Messages.getString("already.guvnor.as"), //$NON-NLS-1$
+ new Object[] { items[i],
+ md.getFullpath() }));
}
}
} catch (Exception e) {
@@ -239,7 +247,7 @@
} else {
Activator.getDefault().
writeLog(IStatus.WARNING,
- "Could not resolve: " + items[i],
+ "Could not resolve: " + items[i], //$NON-NLS-1$
new Exception());
}
}
@@ -345,9 +353,10 @@
Object obj = ((IStructuredSelection)selection).getFirstElement();
if (obj instanceof TreeParent) {
GuvnorRepository rep = ((TreeParent)obj).getGuvnorRepository();
- if (MessageDialog.openConfirm(RepositoryView.this.getSite().getShell(),
- Messages.getString("remove.rep.dialog.caption"), Messages.getString("remove.rep.dialog.msg") + //$NON-NLS-1$ //$NON-NLS-2$
- rep.getLocation())) {
+ if (MessageDialog.openConfirm(RepositoryView.this.getSite().getShell(),
+ Messages.getString("remove.rep.dialog.caption"), //$NON-NLS-1$
+ MessageFormat.format(Messages.getString("remove.rep.dialog.msg"), //$NON-NLS-1$
+ new Object[] { rep.getLocation() }))) {
Activator.getLocationManager().removeRepository(rep.getLocation());
}
}
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/views/ResourceHistoryView.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/views/ResourceHistoryView.java 2008-09-04 18:14:33 UTC (rev 22418)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/views/ResourceHistoryView.java 2008-09-04 18:15:32 UTC (rev 22419)
@@ -2,6 +2,7 @@
import java.net.URL;
+import java.text.MessageFormat;
import java.util.Properties;
import org.eclipse.core.runtime.IStatus;
@@ -37,8 +38,7 @@
import org.guvnor.tools.views.model.ResourceHistoryEntry;
/**
- * View showing the versions of a given resource.
- *
+ * View showing the revisions of a given resource.
* @author jgraham
*
*/
@@ -65,7 +65,8 @@
repositoryLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
resourceLabel = new Label(composite, SWT.NONE);
- resourceLabel.setText(Messages.getString("history.resource.label")); //$NON-NLS-1$
+ resourceLabel.setText(MessageFormat.format(Messages.getString("history.resource.label"), //$NON-NLS-1$
+ new Object[] { "" }));
resourceLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
viewer = new TableViewer(PlatformUtils.createResourceHistoryTable(composite));
@@ -175,7 +176,8 @@
public void setEntries(String repository, String fullPath, Properties entryProps) {
repositoryLabel.setText(Messages.getString("history.rep.label") + repository); //$NON-NLS-1$
repositoryLabel.setToolTipText(repository);
- resourceLabel.setText(Messages.getString("history.resource.label") + fullPath.substring(repository.length())); //$NON-NLS-1$
+ resourceLabel.setText(MessageFormat.format(Messages.getString("history.resource.label"), //$NON-NLS-1$
+ new Object[] { fullPath.substring(repository.length()) }));
resourceLabel.setToolTipText(fullPath);
ResourceHistoryEntry[] entries = GuvnorMetadataUtils.parseHistoryProperties(entryProps);
viewer.setContentProvider(new ResourceHistoryContentProvider(entries));
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/views/model/TreeObject.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/views/model/TreeObject.java 2008-09-04 18:14:33 UTC (rev 22418)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/views/model/TreeObject.java 2008-09-04 18:15:32 UTC (rev 22419)
@@ -5,6 +5,11 @@
import org.guvnor.tools.GuvnorRepository;
import org.guvnor.tools.utils.webdav.ResourceProperties;
+/**
+ * Basic node for the tree representation of Guvnor contents.
+ * @author jgraham
+ *
+ */
public class TreeObject implements IAdaptable {
private GuvnorRepository theRep;
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/views/model/TreeParent.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/views/model/TreeParent.java 2008-09-04 18:14:33 UTC (rev 22418)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/views/model/TreeParent.java 2008-09-04 18:15:32 UTC (rev 22419)
@@ -22,6 +22,10 @@
import org.guvnor.tools.utils.webdav.WebDavException;
import org.guvnor.tools.utils.webdav.WebDavServerCache;
+/**
+ * A container node for Guvnor structure.
+ * @author jgraham
+ */
public class TreeParent extends TreeObject implements IDeferredWorkbenchAdapter {
private ArrayList<TreeObject> children;
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/AddResourceWizard.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/AddResourceWizard.java 2008-09-04 18:14:33 UTC (rev 22418)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/AddResourceWizard.java 2008-09-04 18:15:32 UTC (rev 22419)
@@ -1,5 +1,6 @@
package org.guvnor.tools.wizards;
+import java.text.MessageFormat;
import java.util.Iterator;
import org.eclipse.core.resources.IFile;
@@ -13,6 +14,10 @@
import org.guvnor.tools.utils.GuvnorMetadataUtils;
import org.guvnor.tools.utils.PlatformUtils;
+/**
+ * Wizard for adding resources to Guvnor.
+ * @author jgraham
+ */
public class AddResourceWizard extends Wizard implements INewWizard, IGuvnorWizard {
private SelectGuvnorRepPage selectRepPage;
@@ -71,9 +76,10 @@
}
private void setDuplicateFileError(IFile selectedFile) {
- selectFolderPage.setErrorMessage(selectedFile.getName() +
- Messages.getString("already.exists") + //$NON-NLS-1$
- model.getTargetLocation());
+ selectFolderPage.setErrorMessage(MessageFormat.format(
+ Messages.getString("already.exists.folder"), //$NON-NLS-1$
+ new Object[] { selectedFile.getName(),
+ model.getTargetLocation() }));
model.setTargetLocation(null);
super.getContainer().updateButtons();
}
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/CheckoutWizard.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/CheckoutWizard.java 2008-09-04 18:14:33 UTC (rev 22418)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/CheckoutWizard.java 2008-09-04 18:15:32 UTC (rev 22419)
@@ -1,6 +1,7 @@
package org.guvnor.tools.wizards;
import java.io.ByteArrayInputStream;
+import java.text.MessageFormat;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IWorkspaceRoot;
@@ -22,6 +23,10 @@
import org.guvnor.tools.utils.webdav.ResourceProperties;
import org.guvnor.tools.utils.webdav.WebDavServerCache;
+/**
+ * Wizard for copying Guvnor resources to the local workspace.
+ * @author jgraham
+ */
public class CheckoutWizard extends Wizard implements INewWizard, IGuvnorWizard {
private GuvnorMainConfigPage mainConfigPage;
@@ -144,7 +149,8 @@
final IPath basePath = conflictingFile.getFullPath().removeLastSegments(1);
InputDialog dialog = new InputDialog(super.getShell(),
Messages.getString("name.conflict"), //$NON-NLS-1$
- Messages.getString("name.conflict.request") + conflictingFile.getName(), //$NON-NLS-1$
+ MessageFormat.format(Messages.getString("name.conflict.request"), //$NON-NLS-1$
+ new Object[] { conflictingFile.getName() }),
Messages.getString("copy.of") + conflictingFile.getName(), //$NON-NLS-1$
new IInputValidator() {
public String isValid(String newText) {
@@ -153,7 +159,8 @@
|| !temp.exists()) {
return null;
} else {
- return newText + Messages.getString("alreadfy.exists"); //$NON-NLS-1$
+ return MessageFormat.format(Messages.getString("already.exists"), //$NON-NLS-1$
+ new Object[] { newText });
}
}
});
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/GuvWizNewProjectPage.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/GuvWizNewProjectPage.java 2008-09-04 18:14:33 UTC (rev 22418)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/GuvWizNewProjectPage.java 2008-09-04 18:15:32 UTC (rev 22419)
@@ -2,11 +2,13 @@
import org.eclipse.ui.dialogs.WizardNewProjectCreationPage;
+/**
+ * Wrapper around the standard Eclipse new project page.
+ * @author jgraham
+ */
public class GuvWizNewProjectPage extends WizardNewProjectCreationPage {
public GuvWizNewProjectPage(String pageName) {
super(pageName);
- }
-
-
+ }
}
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/GuvWizardModel.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/GuvWizardModel.java 2008-09-04 18:14:33 UTC (rev 22418)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/GuvWizardModel.java 2008-09-04 18:15:32 UTC (rev 22419)
@@ -2,6 +2,10 @@
import java.util.List;
+/**
+ * Container for Guvnor connection details.
+ * @author jgraham
+ */
public class GuvWizardModel {
private String repLocation;
private String username;
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/GuvnorMainConfigPage.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/GuvnorMainConfigPage.java 2008-09-04 18:14:33 UTC (rev 22418)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/GuvnorMainConfigPage.java 2008-09-04 18:15:32 UTC (rev 22419)
@@ -28,6 +28,10 @@
import org.guvnor.tools.preferences.GuvnorPreferencePage;
import org.guvnor.tools.utils.PlatformUtils;
+/**
+ * Wizard page for entering Guvnor connection details.
+ * @author jgraham
+ */
public class GuvnorMainConfigPage extends WizardPage {
private Text serverField;
@@ -124,7 +128,7 @@
new Label(pwgroup, SWT.NONE).setText(Messages.getString("mainconfig.save.password")); //$NON-NLS-1$
new Label(composite, SWT.NONE).setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
warningLabel = new Label(composite, SWT.WRAP);
- warningLabel.setText(Messages.getString("mainconfig.save.password.warning")); //$NON-NLS-1$
+ warningLabel.setText(Messages.getString("password.warning")); //$NON-NLS-1$
warningLabel.setEnabled(shouldSavePasswords);
super.setControl(composite);
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/IGuvnorWizard.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/IGuvnorWizard.java 2008-09-04 18:14:33 UTC (rev 22418)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/IGuvnorWizard.java 2008-09-04 18:15:32 UTC (rev 22419)
@@ -1,5 +1,10 @@
package org.guvnor.tools.wizards;
+/**
+ * Methods common to Guvnor wizards.
+ * @author jgraham
+ *
+ */
public interface IGuvnorWizard {
public GuvWizardModel getModel();
}
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/NewRepLocationWizard.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/NewRepLocationWizard.java 2008-09-04 18:14:33 UTC (rev 22418)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/NewRepLocationWizard.java 2008-09-04 18:15:32 UTC (rev 22419)
@@ -8,6 +8,11 @@
import org.guvnor.tools.Activator;
import org.guvnor.tools.Messages;
+/**
+ * Wizard page for creating a new Guvnor connection.
+ * @author jgraham
+ *
+ */
public class NewRepLocationWizard extends Wizard implements INewWizard, IGuvnorWizard {
private GuvnorMainConfigPage mainPage;
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/SelectGuvnorFolderPage.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/SelectGuvnorFolderPage.java 2008-09-04 18:14:33 UTC (rev 22418)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/SelectGuvnorFolderPage.java 2008-09-04 18:15:32 UTC (rev 22419)
@@ -22,6 +22,10 @@
import org.guvnor.tools.views.model.TreeObject;
import org.guvnor.tools.views.model.TreeParent;
+/**
+ * Wizard page for selecting a target folder in Guvnor.
+ * @author jgraham
+ */
public class SelectGuvnorFolderPage extends WizardPage {
private TreeViewer viewer;
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/SelectGuvnorRepPage.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/SelectGuvnorRepPage.java 2008-09-04 18:14:33 UTC (rev 22418)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/SelectGuvnorRepPage.java 2008-09-04 18:15:32 UTC (rev 22419)
@@ -14,6 +14,10 @@
import org.guvnor.tools.Messages;
import org.guvnor.tools.utils.PlatformUtils;
+/**
+ * Wizard page for selecting a Guvnor repository.
+ * @author jgraham
+ */
public class SelectGuvnorRepPage extends WizardPage {
private Button createRep;
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/SelectGuvnorResourcesPage.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/SelectGuvnorResourcesPage.java 2008-09-04 18:14:33 UTC (rev 22418)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/SelectGuvnorResourcesPage.java 2008-09-04 18:15:32 UTC (rev 22419)
@@ -22,6 +22,10 @@
import org.guvnor.tools.views.RepositoryLabelProvider;
import org.guvnor.tools.views.model.TreeObject;
+/**
+ * Wizard page for selecting resources in Guvnor.
+ * @author jgraham
+ */
public class SelectGuvnorResourcesPage extends WizardPage {
private TreeViewer viewer;
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/SelectLocalTargetPage.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/SelectLocalTargetPage.java 2008-09-04 18:14:33 UTC (rev 22418)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/SelectLocalTargetPage.java 2008-09-04 18:15:32 UTC (rev 22419)
@@ -19,6 +19,11 @@
import org.guvnor.tools.Messages;
import org.guvnor.tools.utils.PlatformUtils;
+/**
+ * Wizard page for selecting the location where Guvnor resources will be copied.
+ * @author jgraham
+ *
+ */
public class SelectLocalTargetPage extends WizardPage {
private TreeViewer viewer;
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/SelectResourceVersionPage.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/SelectResourceVersionPage.java 2008-09-04 18:14:33 UTC (rev 22418)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/SelectResourceVersionPage.java 2008-09-04 18:15:32 UTC (rev 22419)
@@ -10,6 +10,10 @@
import org.guvnor.tools.Messages;
import org.guvnor.tools.utils.PlatformUtils;
+/**
+ * Wizard page for selecting the revision of a given resource.
+ * @author jgraham
+ */
public class SelectResourceVersionPage extends WizardPage {
private List versions;
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/WizardUtils.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/WizardUtils.java 2008-09-04 18:14:33 UTC (rev 22418)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/WizardUtils.java 2008-09-04 18:15:32 UTC (rev 22419)
@@ -12,6 +12,10 @@
import org.guvnor.tools.utils.webdav.WebDavServerCache;
import org.guvnor.tools.utils.webdav.WebDavSessionAuthenticator;
+/**
+ * Utilities for the Guvnor wizards.
+ * @author jgraham
+ */
public class WizardUtils {
public static void createGuvnorRepository(GuvWizardModel model) throws Exception {
Activator.getLocationManager().addRepository(new GuvnorRepository(model.getRepLocation()));
More information about the jboss-svn-commits
mailing list