diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/ISystemModelChangeEvent.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemModelChangeEvent.java similarity index 76% rename from rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/ISystemModelChangeEvent.java rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemModelChangeEvent.java index b52f179673c..ec42458554c 100644 --- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/ISystemModelChangeEvent.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemModelChangeEvent.java @@ -14,7 +14,7 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.model; +package org.eclipse.rse.core.model; /** * A change event passed to you when listening for RSE model changes. @@ -23,13 +23,13 @@ package org.eclipse.rse.model; public interface ISystemModelChangeEvent { /** - * Get the event type, such as {@link org.eclipse.rse.model.ISystemModelChangeEvents#SYSTEM_RESOURCE_ADDED}. - * @see org.eclipse.rse.model.ISystemModelChangeEvents + * Get the event type, such as {@link org.eclipse.rse.core.model.ISystemModelChangeEvents#SYSTEM_RESOURCE_ADDED}. + * @see org.eclipse.rse.core.model.ISystemModelChangeEvents */ public int getEventType(); /** - * Get the resource type, such as {@link org.eclipse.rse.model.ISystemModelChangeEvents#SYSTEM_RESOURCETYPE_CONNECTION}. - * @see org.eclipse.rse.model.ISystemModelChangeEvents + * Get the resource type, such as {@link org.eclipse.rse.core.model.ISystemModelChangeEvents#SYSTEM_RESOURCETYPE_CONNECTION}. + * @see org.eclipse.rse.core.model.ISystemModelChangeEvents */ public int getResourceType(); /** diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/ISystemModelChangeEvents.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemModelChangeEvents.java similarity index 96% rename from rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/ISystemModelChangeEvents.java rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemModelChangeEvents.java index e09a3c66cd3..d4e2caaf759 100644 --- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/ISystemModelChangeEvents.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemModelChangeEvents.java @@ -14,13 +14,14 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.model; +package org.eclipse.rse.core.model; + /** * The event IDs sent when local resources in the RSE model change. * You should monitor for these events in your view if you display any of the resource types listed here. *
- * To monitor, implement interface {@link org.eclipse.rse.model.ISystemModelChangeListener} and + * To monitor, implement interface {@link org.eclipse.rse.core.model.ISystemModelChangeListener} and * call {@link org.eclipse.rse.model.ISystemRegistry#addSystemModelChangeListener(ISystemModelChangeListener)} * and in your dispose method, call {@link org.eclipse.rse.model.ISystemRegistry#removeSystemModelChangeListener(ISystemModelChangeListener)}. *
diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/ISystemModelChangeListener.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemModelChangeListener.java similarity index 95% rename from rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/ISystemModelChangeListener.java rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemModelChangeListener.java index c1b8dfeb6f5..76d26ca50df 100644 --- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/ISystemModelChangeListener.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemModelChangeListener.java @@ -14,12 +14,14 @@ * {Name} (company) - description of contribution. ********************************************************************************/ -package org.eclipse.rse.model; +package org.eclipse.rse.core.model; + + /** * Interface that listeners interesting in changes to local resources in the RSE model * implement, and subsequently register their interest, via SystemRegistry. *
- * If you list any of the resource types defined in {@link org.eclipse.rse.model.ISystemModelChangeEvents}
+ * If you list any of the resource types defined in {@link org.eclipse.rse.core.model.ISystemModelChangeEvents}
* you should monitor by implementing this interface, and registering with the
* system registry via {@link org.eclipse.rse.model.ISystemRegistry#addSystemModelChangeListener(ISystemModelChangeListener)}.
* In your view's dispose method, you must also de-register by calling
diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/ISystemPreferenceChangeEvent.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemPreferenceChangeEvent.java
similarity index 81%
rename from rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/ISystemPreferenceChangeEvent.java
rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemPreferenceChangeEvent.java
index e604ecccc94..6b36afe2ece 100644
--- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/ISystemPreferenceChangeEvent.java
+++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemPreferenceChangeEvent.java
@@ -14,23 +14,23 @@
* {Name} (company) - description of contribution.
********************************************************************************/
-package org.eclipse.rse.model;
+package org.eclipse.rse.core.model;
/**
* Interface of event sent when a remote system preference changes.
- * @see org.eclipse.rse.model.ISystemPreferenceChangeEvents
+ * @see org.eclipse.rse.core.model.ISystemPreferenceChangeEvents
*/
-public interface ISystemPreferenceChangeEvent extends ISystemResourceChangeEvents
+public interface ISystemPreferenceChangeEvent
{
/**
* Returns the type of the event.
- * @see org.eclipse.rse.model.ISystemPreferenceChangeEvents
+ * @see org.eclipse.rse.core.model.ISystemPreferenceChangeEvents
* @return a type that is one of the constants in this interface
*/
public int getType();
/**
* Set the type
- * @see org.eclipse.rse.model.ISystemPreferenceChangeEvents
+ * @see org.eclipse.rse.core.model.ISystemPreferenceChangeEvents
*/
public void setType(int type);
/**
diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/ISystemPreferenceChangeEvents.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemPreferenceChangeEvents.java
similarity index 97%
rename from rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/ISystemPreferenceChangeEvents.java
rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemPreferenceChangeEvents.java
index ee8a6afb74f..e938d0b17a1 100644
--- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/ISystemPreferenceChangeEvents.java
+++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemPreferenceChangeEvents.java
@@ -14,7 +14,7 @@
* {Name} (company) - description of contribution.
********************************************************************************/
-package org.eclipse.rse.model;
+package org.eclipse.rse.core.model;
/**
* Interface of event ID constants for preferences changed
*/
diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/ISystemPreferenceChangeListener.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemPreferenceChangeListener.java
similarity index 97%
rename from rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/ISystemPreferenceChangeListener.java
rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemPreferenceChangeListener.java
index da2e5a163bc..3e67cfeffee 100644
--- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/ISystemPreferenceChangeListener.java
+++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemPreferenceChangeListener.java
@@ -14,9 +14,10 @@
* {Name} (company) - description of contribution.
********************************************************************************/
-package org.eclipse.rse.model;
+package org.eclipse.rse.core.model;
import java.util.EventListener;
+
/**
* Interface that listeners interesting in changes to remote
* system preferences can implement and subsequently register
diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/ISystemResourceSet.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemResourceSet.java
similarity index 97%
rename from rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/ISystemResourceSet.java
rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemResourceSet.java
index 2df0464a7fb..430da0f064d 100644
--- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/ISystemResourceSet.java
+++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemResourceSet.java
@@ -14,7 +14,7 @@
* {Name} (company) - description of contribution.
********************************************************************************/
-package org.eclipse.rse.model;
+package org.eclipse.rse.core.model;
import java.util.List;
diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/SystemChildrenContentsType.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/SystemChildrenContentsType.java
similarity index 96%
rename from rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/SystemChildrenContentsType.java
rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/SystemChildrenContentsType.java
index 3fa0614e4ff..8bfa1c66cd1 100644
--- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/SystemChildrenContentsType.java
+++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/SystemChildrenContentsType.java
@@ -15,7 +15,8 @@
********************************************************************************/
-package org.eclipse.rse.model;
+package org.eclipse.rse.core.model;
+
/**
@@ -23,7 +24,7 @@ package org.eclipse.rse.model;
*/
public class SystemChildrenContentsType implements ISystemContentsType
{
- public static String CONTENTS_TYPE_CHILDREN = "contents_children";
+ public static String CONTENTS_TYPE_CHILDREN = "contents_children"; //$NON-NLS-1$
public static SystemChildrenContentsType _instance = new SystemChildrenContentsType();
public static SystemChildrenContentsType getInstance()
diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/SystemFilterStringContentsType.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/SystemFilterStringContentsType.java
similarity index 95%
rename from rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/SystemFilterStringContentsType.java
rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/SystemFilterStringContentsType.java
index 9ad29d1672e..22c44318025 100644
--- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/SystemFilterStringContentsType.java
+++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/SystemFilterStringContentsType.java
@@ -14,13 +14,15 @@
* {Name} (company) - description of contribution.
********************************************************************************/
-package org.eclipse.rse.model;
+package org.eclipse.rse.core.model;
+
+
/**
* Represents contents that are children of a container
*/
public class SystemFilterStringContentsType implements ISystemContentsType
{
- public static String CONTENTS_TYPE_CHILDREN_PARENTS = "contents_children_parents";
+ public static String CONTENTS_TYPE_CHILDREN_PARENTS = "contents_children_parents"; //$NON-NLS-1$
public static SystemFilterStringContentsType _instance = new SystemFilterStringContentsType();
public static SystemFilterStringContentsType getInstance()
diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/SystemMessageObject.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/SystemMessageObject.java
similarity index 95%
rename from rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/SystemMessageObject.java
rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/SystemMessageObject.java
index b3b3f6f4ed3..7fbcabe4d6b 100644
--- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/SystemMessageObject.java
+++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/SystemMessageObject.java
@@ -14,7 +14,7 @@
* {Name} (company) - description of contribution.
********************************************************************************/
-package org.eclipse.rse.model;
+package org.eclipse.rse.core.model;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.Platform;
import org.eclipse.rse.services.clientserver.messages.SystemMessage;
@@ -35,7 +35,7 @@ public class SystemMessageObject implements ISystemMessageObject, IAdaptable, Co
* @param msgObj The system message from which to retrieve text to show in the tree viewer
* @param type The message severity, dictating the icon.
* @param parent The parent node of this within the tree view
- * @see org.eclipse.rse.model.ISystemMessageObject
+ * @see org.eclipse.rse.core.model.ISystemMessageObject
*/
public SystemMessageObject(SystemMessage msgObj, int type, Object parent)
{
@@ -55,7 +55,7 @@ public class SystemMessageObject implements ISystemMessageObject, IAdaptable, Co
/**
* Message type.
- * @see org.eclipse.rse.model.ISystemMessageObject
+ * @see org.eclipse.rse.core.model.ISystemMessageObject
*/
public int getType()
{
diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/SystemWorkspaceResourceSet.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/SystemWorkspaceResourceSet.java
similarity index 97%
rename from rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/SystemWorkspaceResourceSet.java
rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/SystemWorkspaceResourceSet.java
index 6d412e488f1..d412e3969f9 100644
--- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/SystemWorkspaceResourceSet.java
+++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/SystemWorkspaceResourceSet.java
@@ -14,7 +14,7 @@
* {Name} (company) - description of contribution.
********************************************************************************/
-package org.eclipse.rse.model;
+package org.eclipse.rse.core.model;
import java.util.List;
import org.eclipse.core.resources.IResource;
diff --git a/rse/plugins/org.eclipse.rse.eclipse.filesystem/src/org/eclipse/rse/eclipse/filesystem/RSEFileSystemContributor.java b/rse/plugins/org.eclipse.rse.eclipse.filesystem/src/org/eclipse/rse/eclipse/filesystem/RSEFileSystemContributor.java
index 1915de81de8..3fb392eadf2 100644
--- a/rse/plugins/org.eclipse.rse.eclipse.filesystem/src/org/eclipse/rse/eclipse/filesystem/RSEFileSystemContributor.java
+++ b/rse/plugins/org.eclipse.rse.eclipse.filesystem/src/org/eclipse/rse/eclipse/filesystem/RSEFileSystemContributor.java
@@ -70,7 +70,7 @@ public class RSEFileSystemContributor extends FileSystemContributor {
String hostName = host.getHostName();
try
{
- return new URI("rse", hostName, path, null);
+ return new URI("rse", hostName, path, null); //$NON-NLS-1$
}
catch (Exception e)
{
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemAddToArchiveAction.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemAddToArchiveAction.java
index 3899d91e8ec..2a5066d3923 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemAddToArchiveAction.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemAddToArchiveAction.java
@@ -67,7 +67,7 @@ public class SystemAddToArchiveAction extends SystemBaseAction
_selected = new ArrayList();
_parent = parent;
allowOnMultipleSelection(true);
- setHelp(RSEUIPlugin.HELPPREFIX + "actn0122");
+ setHelp(RSEUIPlugin.HELPPREFIX + "actn0122"); //$NON-NLS-1$
}
public SystemAddToArchiveAction(Shell parent, String label, String tooltip)
@@ -76,7 +76,7 @@ public class SystemAddToArchiveAction extends SystemBaseAction
_selected = new ArrayList();
_parent = parent;
allowOnMultipleSelection(true);
- setHelp(RSEUIPlugin.HELPPREFIX + "actn0122");
+ setHelp(RSEUIPlugin.HELPPREFIX + "actn0122"); //$NON-NLS-1$
}
public void run()
@@ -113,7 +113,7 @@ public class SystemAddToArchiveAction extends SystemBaseAction
IRemoteFile destinationArchive = null;
IRemoteFileSubSystem destSS = null;
boolean saveFullPathInfo;
- String relativeTo = "";
+ String relativeTo = ""; //$NON-NLS-1$
if (!cancelled)
{
@@ -406,6 +406,6 @@ public class SystemAddToArchiveAction extends SystemBaseAction
return str1.substring(0, i);
}
}
- return "";
+ return ""; //$NON-NLS-1$
}
}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemCopyRemoteFileAction.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemCopyRemoteFileAction.java
index a7a6e23d38b..cce1f22ee04 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemCopyRemoteFileAction.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemCopyRemoteFileAction.java
@@ -75,8 +75,8 @@ public class SystemCopyRemoteFileAction extends SystemBaseCopyAction
SystemCopyRemoteFileAction(Shell shell, int mode)
{
super(shell, mode);
- setHelp(RSEUIPlugin.HELPPREFIX+"actn0110");
- setDialogHelp(RSEUIPlugin.HELPPREFIX+"dcrf0000");
+ setHelp(RSEUIPlugin.HELPPREFIX+"actn0110"); //$NON-NLS-1$
+ setDialogHelp(RSEUIPlugin.HELPPREFIX+"dcrf0000"); //$NON-NLS-1$
}
/**
@@ -212,7 +212,7 @@ public class SystemCopyRemoteFileAction extends SystemBaseCopyAction
{
IRemoteFileSubSystem targetFS = targetFolder.getParentRemoteFileSubSystem();
IRemoteFileSubSystem srcFS = srcFileOrFolder.getParentRemoteFileSubSystem();
- String newPath = targetFolder.getAbsolutePath() + "/" + newName;
+ String newPath = targetFolder.getAbsolutePath() + "/" + newName; //$NON-NLS-1$
if (srcFileOrFolder.isFile())
{
SystemRemoteEditManager mgr = SystemRemoteEditManager.getDefault();
@@ -221,7 +221,7 @@ public class SystemCopyRemoteFileAction extends SystemBaseCopyAction
mgr.getRemoteEditProject();
StringBuffer path = new StringBuffer(mgr.getRemoteEditProjectLocation().makeAbsolute().toOSString());
- path = path.append("/" + srcFS.getSystemProfileName() + "/" + srcFS.getHostAliasName() + "/");
+ path = path.append("/" + srcFS.getSystemProfileName() + "/" + srcFS.getHostAliasName() + "/"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
String absolutePath = srcFileOrFolder.getAbsolutePath();
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemExtractToAction.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemExtractToAction.java
index c4c78787cef..1f4429a9f22 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemExtractToAction.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemExtractToAction.java
@@ -58,7 +58,7 @@ public class SystemExtractToAction extends SystemExtractAction implements IValid
public SystemExtractToAction(Shell parent)
{
super(parent,FileResources.ACTION_EXTRACT_TO_LABEL, FileResources.ACTION_EXTRACT_TO_TOOLTIP);
- setHelp(RSEUIPlugin.HELPPREFIX + "actn0119");
+ setHelp(RSEUIPlugin.HELPPREFIX + "actn0119"); //$NON-NLS-1$
setImageDescriptor(RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_EXTRACTTO_ID));
}
@@ -66,7 +66,7 @@ public class SystemExtractToAction extends SystemExtractAction implements IValid
public SystemExtractToAction(Shell parent, String label, String tooltip)
{
super(parent, label, tooltip);
- setHelp(RSEUIPlugin.HELPPREFIX + "actn0119");
+ setHelp(RSEUIPlugin.HELPPREFIX + "actn0119"); //$NON-NLS-1$
setImageDescriptor(RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_EXTRACTTO_ID));
}
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemMoveRemoteFileAction.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemMoveRemoteFileAction.java
index 7abd3879734..74dff3351f1 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemMoveRemoteFileAction.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemMoveRemoteFileAction.java
@@ -48,8 +48,8 @@ public class SystemMoveRemoteFileAction extends SystemCopyRemoteFileAction
public SystemMoveRemoteFileAction(Shell shell)
{
super(shell, MODE_MOVE);
- setHelp(RSEUIPlugin.HELPPREFIX+"actn0111");
- setDialogHelp(RSEUIPlugin.HELPPREFIX+"dmrf0000");
+ setHelp(RSEUIPlugin.HELPPREFIX+"actn0111"); //$NON-NLS-1$
+ setDialogHelp(RSEUIPlugin.HELPPREFIX+"dmrf0000"); //$NON-NLS-1$
}
// --------------------------
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemPromptForHomeFolderDialog.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemPromptForHomeFolderDialog.java
index 85046757af2..db4db0f1145 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemPromptForHomeFolderDialog.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemPromptForHomeFolderDialog.java
@@ -83,7 +83,7 @@ public class SystemPromptForHomeFolderDialog
boolean readOnly = false;
folderCombo = new SystemRemoteFolderCombo(composite_prompts, SWT.BORDER, null, readOnly);
folderCombo.setSystemConnection(connection);
- folderCombo.setText("/home/"+connection.getDefaultUserId());
+ folderCombo.setText("/home/"+connection.getDefaultUserId()); //$NON-NLS-1$
// listen for selections
//folderCombo.addSelectionListener(this);
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemRemoteArchiveDialog.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemRemoteArchiveDialog.java
index 4fce6f3727b..3aca11a68f8 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemRemoteArchiveDialog.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemRemoteArchiveDialog.java
@@ -50,8 +50,8 @@ public class SystemRemoteArchiveDialog extends SystemRemoteFileDialog
{
_filter = new SystemActionViewerFilter();
Class[] types = {IRemoteFile.class};
- _filter.addFilterCriterion(types, "isDirectory", "true");
- _filter.addFilterCriterion(types, "isArchive", "true");
+ _filter.addFilterCriterion(types, "isDirectory", "true"); //$NON-NLS-1$ //$NON-NLS-2$
+ _filter.addFilterCriterion(types, "isArchive", "true"); //$NON-NLS-1$ //$NON-NLS-2$
}
return _filter;
}
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemRemoteFileSelectionInputProvider.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemRemoteFileSelectionInputProvider.java
index 8b59a954086..bd66a671c94 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemRemoteFileSelectionInputProvider.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemRemoteFileSelectionInputProvider.java
@@ -29,13 +29,13 @@ public class SystemRemoteFileSelectionInputProvider extends
public SystemRemoteFileSelectionInputProvider(IHost connection)
{
super(connection);
- setCategory("files");
+ setCategory("files"); //$NON-NLS-1$
}
public SystemRemoteFileSelectionInputProvider()
{
super();
- setCategory("files");
+ setCategory("files"); //$NON-NLS-1$
}
protected ISubSystem getSubSystem(IHost selectedConnection)
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemRemoteFolderDialog.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemRemoteFolderDialog.java
index ac6e9973ed6..579b6999586 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemRemoteFolderDialog.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemRemoteFolderDialog.java
@@ -50,7 +50,7 @@ public class SystemRemoteFolderDialog extends SystemRemoteFileDialog
{
_filter = new SystemActionViewerFilter();
Class[] types = {IRemoteFile.class};
- _filter.addFilterCriterion(types, "isDirectory", "true");
+ _filter.addFilterCriterion(types, "isDirectory", "true"); //$NON-NLS-1$ //$NON-NLS-2$
}
return _filter;
}
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/CombineForm.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/CombineForm.java
index 1a8b9337745..6d6095e8410 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/CombineForm.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/CombineForm.java
@@ -64,7 +64,7 @@ public class CombineForm extends SystemSelectRemoteFileOrFolderForm
protected ValidatorFileName validator;
protected ValidatorArchiveName arcvalidator;
protected boolean prePop;
- protected String nameAndTypePrompt = "";
+ protected String nameAndTypePrompt = ""; //$NON-NLS-1$
protected String[] disallowedExtensions;
/**
@@ -117,12 +117,12 @@ public class CombineForm extends SystemSelectRemoteFileOrFolderForm
public void modifyText(ModifyEvent e) {
fileName = fileNameText.getText();
setPageComplete();
- if (fileName.indexOf(".") != -1)
+ if (fileName.indexOf(".") != -1) //$NON-NLS-1$
{
SystemMessage isValidMsg = arcvalidator.validate(fileName);
if (isValidMsg == null)
{
- int i = fileName.lastIndexOf(".");
+ int i = fileName.lastIndexOf("."); //$NON-NLS-1$
fileType = fileName.substring(i+1);
fileTypeCombo.setText(fileType);
}
@@ -225,7 +225,7 @@ public class CombineForm extends SystemSelectRemoteFileOrFolderForm
String nameToCheck = null;
if (fileName == null) {
- nameToCheck = "";
+ nameToCheck = ""; //$NON-NLS-1$
}
else {
nameToCheck = fileName;
@@ -252,11 +252,11 @@ public class CombineForm extends SystemSelectRemoteFileOrFolderForm
public String getFileName() {
- if (fileName.endsWith("." + fileType)) {
+ if (fileName.endsWith("." + fileType)) { //$NON-NLS-1$
return fileName;
}
else {
- return fileName + "." + fileType;
+ return fileName + "." + fileType; //$NON-NLS-1$
}
}
@@ -339,11 +339,11 @@ public class CombineForm extends SystemSelectRemoteFileOrFolderForm
if (prePop)
{
String file = selection.getName();
- int i = file.lastIndexOf(".");
+ int i = file.lastIndexOf("."); //$NON-NLS-1$
if (i == -1)
{
fileName = file;
- fileType = "";
+ fileType = ""; //$NON-NLS-1$
}
else
{
@@ -353,7 +353,7 @@ public class CombineForm extends SystemSelectRemoteFileOrFolderForm
}
else
{
- fileName = "";
+ fileName = ""; //$NON-NLS-1$
}
}
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/ExtractToForm.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/ExtractToForm.java
index 2ef3f2e8d87..88d25aa2791 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/ExtractToForm.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/ExtractToForm.java
@@ -188,7 +188,7 @@ public class ExtractToForm extends SystemSelectRemoteFileOrFolderForm
fileName = remoteFile.getName();
if (remoteFile.isRoot())
{
- if (fileName.endsWith("\\")) fileName = fileName.substring(0,2);
+ if (fileName.endsWith("\\")) fileName = fileName.substring(0,2); //$NON-NLS-1$
}
ISystemRemoteElementAdapter remoteAdapter = getRemoteAdapter(selectedObject);
if ((remoteAdapter != null))
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemEditableRemoteFile.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemEditableRemoteFile.java
index 41b11f103f2..077f902608e 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemEditableRemoteFile.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemEditableRemoteFile.java
@@ -243,14 +243,13 @@ public class SystemEditableRemoteFile implements ISystemEditableRemoteObject, IP
protected IEditorDescriptor getDefaultTextEditor()
{
IEditorRegistry registry = getEditorRegistry();
- return registry.findEditor("org.eclipse.ui.DefaultTextEditor");
+ return registry.findEditor("org.eclipse.ui.DefaultTextEditor"); //$NON-NLS-1$
}
/**
* Returns an instance of this class given a local copy of a remote file.
* @param file the local file to create it from.
- * @return
*/
public static SystemEditableRemoteFile getInstance(IFile file) {
@@ -288,10 +287,10 @@ public class SystemEditableRemoteFile implements ISystemEditableRemoteObject, IP
IHost connection = fs.getHost();
// on windows systems, we need to take into account drives and different separators
- boolean isWindows = connection.getSystemType().equals("Local") || fs.getHost().getSystemType().equals("Windows");
+ boolean isWindows = connection.getSystemType().equals("Local") || fs.getHost().getSystemType().equals("Windows"); //$NON-NLS-1$ //$NON-NLS-2$
char fileSeparator = isWindows ? '\\' : '/';
- StringBuffer tempRemotePath = new StringBuffer("");
+ StringBuffer tempRemotePath = new StringBuffer(""); //$NON-NLS-1$
for (int i = 3; i < numSegments; i++)
{
if (i == 3)
@@ -307,7 +306,7 @@ public class SystemEditableRemoteFile implements ISystemEditableRemoteObject, IP
{
if (isWindows)
{
- tempRemotePath.append(":");
+ tempRemotePath.append(":"); //$NON-NLS-1$
}
}
@@ -434,7 +433,7 @@ public class SystemEditableRemoteFile implements ISystemEditableRemoteObject, IP
/**
* Download the file.
- * @param if the shell is null, no progress monitor will be shown
+ * @param shell if the shell is null, no progress monitor will be shown
* @return true if successful, false if cancelled
*/
public boolean download(Shell shell) throws Exception
@@ -491,7 +490,7 @@ public class SystemEditableRemoteFile implements ISystemEditableRemoteObject, IP
/**
* Download the file.
- * @param the progress monitor
+ * @param monitor the progress monitor
* @return true if the operation was successful. false if the user cancels.
*/
public boolean download(IProgressMonitor monitor) throws Exception
@@ -837,7 +836,7 @@ public class SystemEditableRemoteFile implements ISystemEditableRemoteObject, IP
// DKM - now we're using only the hostname to prefix the remote path. Thus multiple connections to the same place will
// yield the temp files
//path = path.append("/" + subsystem.getSystemProfileName() + "/" + subsystem.getSystemConnectionName() + "/");
- path = path.append("/" + _actualRemoteHost + "/");
+ path = path.append("/" + _actualRemoteHost + "/"); //$NON-NLS-1$ //$NON-NLS-2$
String absolutePath = getWorkspaceRemotePath(remotePath);
@@ -881,7 +880,7 @@ public class SystemEditableRemoteFile implements ISystemEditableRemoteObject, IP
*/
public String getWorkspaceRemotePath(String remotePath)
{
- if (subsystem != null && subsystem.getHost().getSystemType().equals("Local"))
+ if (subsystem != null && subsystem.getHost().getSystemType().equals("Local")) //$NON-NLS-1$
{
return SystemRemoteEditManager.getDefault().getWorkspacePathFor(subsystem.getHost().getHostName(), remotePath);
}
@@ -891,7 +890,7 @@ public class SystemEditableRemoteFile implements ISystemEditableRemoteObject, IP
public String getActualHostFor(String remotePath)
{
String hostname = subsystem.getHost().getHostName();
- if (subsystem != null && subsystem.getHost().getSystemType().equals("Local"))
+ if (subsystem != null && subsystem.getHost().getSystemType().equals("Local")) //$NON-NLS-1$
{
String result = SystemRemoteEditManager.getDefault().getActualHostFor(hostname, remotePath);
if (!result.equals(hostname))
@@ -1292,7 +1291,7 @@ public class SystemEditableRemoteFile implements ISystemEditableRemoteObject, IP
try
{
- if (remoteFile.getSystemConnection().getSystemType().equals("Local"))
+ if (remoteFile.getSystemConnection().getSystemType().equals("Local")) //$NON-NLS-1$
{
// Open local files "in-place", i.e. don't copy them to the
// RemoteSystemsTempFiles project first
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemTempFileListener.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemTempFileListener.java
index 65598151a22..75e45aff1af 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemTempFileListener.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemTempFileListener.java
@@ -526,10 +526,10 @@ public abstract class SystemTempFileListener implements IResourceChangeListener
IHost connection = fs.getHost();
// on windows systems, we need to take into account drives and different separators
- boolean isWindows = connection.getSystemType().equals("Local") || fs.getHost().getSystemType().equals("Windows");
+ boolean isWindows = connection.getSystemType().equals("Local") || fs.getHost().getSystemType().equals("Windows"); //$NON-NLS-1$ //$NON-NLS-2$
char fileSeparator = isWindows ? '\\' : '/';
- StringBuffer remotePath = new StringBuffer("");
+ StringBuffer remotePath = new StringBuffer(""); //$NON-NLS-1$
for (int i = 3; i < numSegments; i++)
{
if (i == 3)
@@ -545,7 +545,7 @@ public abstract class SystemTempFileListener implements IResourceChangeListener
{
if (isWindows)
{
- remotePath.append(":");
+ remotePath.append(":"); //$NON-NLS-1$
}
}
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/UniversalFileTransferUtility.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/UniversalFileTransferUtility.java
index 2acc495a896..104917a68bf 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/UniversalFileTransferUtility.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/UniversalFileTransferUtility.java
@@ -31,12 +31,12 @@ import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.Path;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.rse.core.SystemBasePlugin;
+import org.eclipse.rse.core.model.SystemWorkspaceResourceSet;
import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.files.ui.FileResources;
import org.eclipse.rse.model.IHost;
import org.eclipse.rse.model.ISystemRegistry;
import org.eclipse.rse.model.SystemRemoteResourceSet;
-import org.eclipse.rse.model.SystemWorkspaceResourceSet;
import org.eclipse.rse.services.clientserver.SystemEncodingUtil;
import org.eclipse.rse.services.clientserver.archiveutils.ArchiveHandlerManager;
import org.eclipse.rse.services.clientserver.archiveutils.ISystemArchiveHandler;
@@ -76,7 +76,6 @@ public class UniversalFileTransferUtility
* @param srcFileOrFolder the file or folder to copy
* @param tgtFolder the folder to copy to
* @param monitor the progress monitor
- * @param shell
*/
public static void transferRemoteResource(IRemoteFile srcFileOrFolder, IRemoteFile tgtFolder, IProgressMonitor monitor)
{
@@ -236,7 +235,6 @@ public class UniversalFileTransferUtility
* Replicates a set of remote files or folders to the workspace
* @param remoteSet the objects which are being copied
* @param monitor a progress monitor
- * @param shell
* @return the temporary objects that was created after the download
*/
public static SystemWorkspaceResourceSet copyRemoteResourcesToWorkspace(SystemRemoteResourceSet remoteSet, IProgressMonitor monitor)
@@ -284,7 +282,7 @@ public class UniversalFileTransferUtility
IResource tempFolder = null;
if (doCompressedTransfer && doSuperTransferProperty && !srcFileOrFolder.isRoot()
- && !(srcFileOrFolder.getParentRemoteFileSubSystem().getHost().getSystemType().equals("Local")))
+ && !(srcFileOrFolder.getParentRemoteFileSubSystem().getHost().getSystemType().equals("Local"))) //$NON-NLS-1$
{
try
{
@@ -380,7 +378,6 @@ public class UniversalFileTransferUtility
* Replicates a remote file or folder to the workspace
* @param srcFileOrFolder the object which is being copied
* @param monitor a progress monitor
- * @param shell
* @return the temporary object that was created after the download
*/
public static Object copyRemoteResourceToWorkspace(IRemoteFile srcFileOrFolder, IProgressMonitor monitor)
@@ -448,7 +445,7 @@ public class UniversalFileTransferUtility
boolean doSuperTransferProperty = RSEUIPlugin.getDefault().getPreferenceStore().getBoolean(ISystemPreferencesConstants.DOSUPERTRANSFER);
if (doCompressedTransfer && doSuperTransferProperty && !srcFileOrFolder.isRoot()
- && !(srcFileOrFolder.getParentRemoteFileSubSystem().getHost().getSystemType().equals("Local")))
+ && !(srcFileOrFolder.getParentRemoteFileSubSystem().getHost().getSystemType().equals("Local"))) //$NON-NLS-1$
{
try
{
@@ -550,7 +547,7 @@ public class UniversalFileTransferUtility
{
IHost connection = connections[i];
IRemoteFileSubSystem anFS = RemoteFileUtility.getFileSubSystem(connection);
- if (anFS.getHost().getSystemType().equals("Local"))
+ if (anFS.getHost().getSystemType().equals("Local")) //$NON-NLS-1$
{
return anFS;
}
@@ -562,11 +559,10 @@ public class UniversalFileTransferUtility
/**
* Perform a copy via drag and drop.
- * @param src the object to be copied. If the target and source are not on the same system, then this is a
+ * @param srcFileOrFolder the object to be copied. If the target and source are not on the same system, then this is a
* temporary object produced by the doDrag.
- * @param target the object to be copied to.
+ * @param targetFolder the object to be copied to.
* @param monitor the progress monitor
- * @param shell
* @return the resulting remote object
*/
public static Object copyWorkspaceResourceToRemote(IResource srcFileOrFolder, IRemoteFile targetFolder, IProgressMonitor monitor)
@@ -574,14 +570,13 @@ public class UniversalFileTransferUtility
return copyWorkspaceResourceToRemote(srcFileOrFolder, targetFolder, monitor, true);
}
-/**
+ /**
* Perform a copy via drag and drop.
* @param workspaceSet the objects to be copied. If the target and sources are not on the same system, then this is a
* temporary object produced by the doDrag.
- * @param target the object to be copied to.
+ * @param targetFolder the object to be copied to.
* @param monitor the progress monitor
- * @param shell
- * @param indicates whether to check for colllisions or not
+ * @param checkForCollisions indicates whether to check for colllisions or not
* @return the resulting remote objects
*/
public static SystemRemoteResourceSet copyWorkspaceResourcesToRemote(SystemWorkspaceResourceSet workspaceSet, IRemoteFile targetFolder, IProgressMonitor monitor, boolean checkForCollisions)
@@ -747,7 +742,7 @@ public class UniversalFileTransferUtility
}
- boolean isTargetLocal = newTargetFolder.getParentRemoteFileSubSystem().getHost().getSystemType().equals("Local");
+ boolean isTargetLocal = newTargetFolder.getParentRemoteFileSubSystem().getHost().getSystemType().equals("Local"); //$NON-NLS-1$
boolean destInArchive = (newTargetFolder instanceof IVirtualRemoteFile) || newTargetFolder.isArchive();
if (doCompressedTransfer && doSuperTransferPreference && !destInArchive && !isTargetLocal)
@@ -798,10 +793,9 @@ public class UniversalFileTransferUtility
* Perform a copy via drag and drop.
* @param srcFileOrFolder the object to be copied. If the target and source are not on the same system, then this is a
* temporary object produced by the doDrag.
- * @param target the object to be copied to.
+ * @param targetFolder the object to be copied to.
* @param monitor the progress monitor
- * @param shell
- * @param indicates whether to check for colllisions or not
+ * @param checkForCollisions indicates whether to check for colllisions or not
* @return the result remote object
*/
public static Object copyWorkspaceResourceToRemote(IResource srcFileOrFolder, IRemoteFile targetFolder, IProgressMonitor monitor, boolean checkForCollisions)
@@ -946,7 +940,7 @@ public class UniversalFileTransferUtility
directory.refreshLocal(IResource.DEPTH_ONE, monitor);
- boolean isTargetLocal = newTargetFolder.getParentRemoteFileSubSystem().getHost().getSystemType().equals("Local");
+ boolean isTargetLocal = newTargetFolder.getParentRemoteFileSubSystem().getHost().getSystemType().equals("Local"); //$NON-NLS-1$
boolean destInArchive = (newTargetFolder instanceof IVirtualRemoteFile) || newTargetFolder.isArchive();
boolean doSuperTransferPreference = RSEUIPlugin.getDefault().getPreferenceStore().getBoolean(ISystemPreferencesConstants.DOSUPERTRANSFER);
@@ -1004,7 +998,7 @@ public class UniversalFileTransferUtility
{
monitor.beginTask(FileResources.RESID_SUPERTRANSFER_PROGMON_MAIN,IProgressMonitor.UNKNOWN);
monitor.subTask(FileResources.RESID_SUPERTRANSFER_PROGMON_SUBTASK_CREATE);
- destinationArchive = getLocalFileSubSystem().getRemoteFileObject(File.createTempFile("supertransfer", getArchiveExtensionFromProperties()).getAbsolutePath());
+ destinationArchive = getLocalFileSubSystem().getRemoteFileObject(File.createTempFile("supertransfer", getArchiveExtensionFromProperties()).getAbsolutePath()); //$NON-NLS-1$
FileServiceSubSystem localSS = (FileServiceSubSystem)getLocalFileSubSystem();
try
{
@@ -1111,13 +1105,13 @@ public class UniversalFileTransferUtility
IPreferenceStore store= RSEUIPlugin.getDefault().getPreferenceStore();
String archiveType = store.getString(ISystemPreferencesConstants.SUPERTRANSFER_ARC_TYPE);
- if (archiveType == null || !ArchiveHandlerManager.getInstance().isRegisteredArchive("test." + archiveType))
+ if (archiveType == null || !ArchiveHandlerManager.getInstance().isRegisteredArchive("test." + archiveType)) //$NON-NLS-1$
{
- archiveType = ".zip";
+ archiveType = ".zip"; //$NON-NLS-1$
}
else
{
- archiveType = "." + archiveType;
+ archiveType = "." + archiveType; //$NON-NLS-1$
}
//String archiveType = ".zip";
return archiveType;
@@ -1135,9 +1129,9 @@ public class UniversalFileTransferUtility
{
monitor.beginTask(FileResources.RESID_SUPERTRANSFER_PROGMON_MAIN,IProgressMonitor.UNKNOWN);
monitor.subTask(FileResources.RESID_SUPERTRANSFER_PROGMON_SUBTASK_CREATE);
- File file = File.createTempFile("supertransfer", getArchiveExtensionFromProperties());
+ File file = File.createTempFile("supertransfer", getArchiveExtensionFromProperties()); //$NON-NLS-1$
file.delete();
- String separator = "";
+ String separator = ""; //$NON-NLS-1$
IRemoteFile destinationParent = directory.getParentRemoteFile();
if (!destinationParent.getAbsolutePath().endsWith(directory.getSeparator()))
separator = directory.getSeparator();
@@ -1162,7 +1156,7 @@ public class UniversalFileTransferUtility
}
if (destinationArchive == null)
{
- String homeFolder = directory.getParentRemoteFileSubSystem().getRemoteFileObject("./").getAbsolutePath();
+ String homeFolder = directory.getParentRemoteFileSubSystem().getRemoteFileObject("./").getAbsolutePath(); //$NON-NLS-1$
String destArchPath = homeFolder + separator + file.getName();
destinationArchive = directory.getParentRemoteFileSubSystem().getRemoteFileObject(destArchPath);
if (destinationArchive.exists()) directory.getParentRemoteFileSubSystem().delete(destinationArchive,monitor);
@@ -1353,7 +1347,7 @@ public class UniversalFileTransferUtility
path = path.append(separator + actualHost + separator);
String absolutePath = srcFileOrFolder.getAbsolutePath();
- if (srcFileOrFolder.getSystemConnection().getSystemType().equals("Local"))
+ if (srcFileOrFolder.getSystemConnection().getSystemType().equals("Local")) //$NON-NLS-1$
{
absolutePath = editMgr.getWorkspacePathFor(actualHost, srcFileOrFolder.getAbsolutePath());
}
@@ -1465,7 +1459,7 @@ public class UniversalFileTransferUtility
public static String getActualHostFor(ISubSystem subsystem, String remotePath)
{
String hostname = subsystem.getHost().getHostName();
- if (subsystem != null && subsystem.getHost().getSystemType().equals("Local"))
+ if (subsystem != null && subsystem.getHost().getSystemType().equals("Local")) //$NON-NLS-1$
{
String result = SystemRemoteEditManager.getDefault().getActualHostFor(hostname, remotePath);
return result;
@@ -1494,7 +1488,7 @@ public class UniversalFileTransferUtility
protected static boolean isRemoteFileMounted(ISubSystem subsystem, String remotePath)
{
String hostname = subsystem.getHost().getHostName();
- if (subsystem != null && subsystem.getHost().getSystemType().equals("Local"))
+ if (subsystem != null && subsystem.getHost().getSystemType().equals("Local")) //$NON-NLS-1$
{
String result = SystemRemoteEditManager.getDefault().getActualHostFor(hostname, remotePath);
if (!result.equals(hostname))
@@ -1507,7 +1501,7 @@ public class UniversalFileTransferUtility
protected static String getWorkspaceRemotePath(ISubSystem subsystem, String remotePath)
{
- if (subsystem != null && subsystem.getHost().getSystemType().equals("Local"))
+ if (subsystem != null && subsystem.getHost().getSystemType().equals("Local")) //$NON-NLS-1$
{
return SystemRemoteEditManager.getDefault().getWorkspacePathFor(subsystem.getHost().getHostName(), remotePath);
}
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/search/SystemSearchPage.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/search/SystemSearchPage.java
index 74dcef203c9..5e6a8d49272 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/search/SystemSearchPage.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/search/SystemSearchPage.java
@@ -74,7 +74,7 @@ import org.eclipse.swt.widgets.Shell;
*/
public class SystemSearchPage extends DialogPage implements ISearchPage {
- public static final String SYSTEM_SEARCH_PAGE_ID = "org.eclipse.rse.files.ui.search.searchPage";
+ public static final String SYSTEM_SEARCH_PAGE_ID = "org.eclipse.rse.files.ui.search.searchPage"; //$NON-NLS-1$
// search utility
private SystemSearchUtil util;
@@ -120,27 +120,27 @@ public class SystemSearchPage extends DialogPage implements ISearchPage {
private boolean initialSearchSubfolders;
// constants for storing configuration
- private static final String REMOTE_SEARCH_PAGE_NAME = "RemoteSearchPage";
- private static final String STORE_CONFIG_CASE_SENSITIVE = "caseSensitive";
- private static final String STORE_CONFIG_STRING_REGEX = "stringRegex";
- private static final String STORE_CONFIG_FILENAME_REGEX = "fileNameRegex";
- private static final String STORE_CONFIG_INCLUDE_ARCHIVES = "includeArchives";
- private static final String STORE_CONFIG_INCLUDE_SUBFOLDERS = "includeSubfolders";
+ private static final String REMOTE_SEARCH_PAGE_NAME = "RemoteSearchPage"; //$NON-NLS-1$
+ private static final String STORE_CONFIG_CASE_SENSITIVE = "caseSensitive"; //$NON-NLS-1$
+ private static final String STORE_CONFIG_STRING_REGEX = "stringRegex"; //$NON-NLS-1$
+ private static final String STORE_CONFIG_FILENAME_REGEX = "fileNameRegex"; //$NON-NLS-1$
+ private static final String STORE_CONFIG_INCLUDE_ARCHIVES = "includeArchives"; //$NON-NLS-1$
+ private static final String STORE_CONFIG_INCLUDE_SUBFOLDERS = "includeSubfolders"; //$NON-NLS-1$
- private static final String STORE_CONFIG_DATA_SIZE = "dataSize";
+ private static final String STORE_CONFIG_DATA_SIZE = "dataSize"; //$NON-NLS-1$
// constants for storing data
- private static final String STORE_DATA_PREFIX = REMOTE_SEARCH_PAGE_NAME + ".data";
- private static final String STORE_DATA_SEARCH_STRING = "searchString";
- private static final String STORE_DATA_CASE_SENSITIVE = "caseSensitive";
- private static final String STORE_DATA_STRING_REGEX = "stringRegex";
- private static final String STORE_DATA_FILE_NAMES = "fileNames";
- private static final String STORE_DATA_FILE_NAME_REGEX = "fileNameRegex";
- private static final String STORE_DATA_PROFILE_NAME = "profileName";
- private static final String STORE_DATA_CONNECTION_NAME = "connectionName";
- private static final String STORE_DATA_FOLDER_NAME = "folderName";
- private static final String STORE_DATA_INCLUDE_ARCHIVES = "includeArchives";
- private static final String STORE_DATA_INCLUDE_SUBFOLDERS = "includeSubfolders";
+ private static final String STORE_DATA_PREFIX = REMOTE_SEARCH_PAGE_NAME + ".data"; //$NON-NLS-1$
+ private static final String STORE_DATA_SEARCH_STRING = "searchString"; //$NON-NLS-1$
+ private static final String STORE_DATA_CASE_SENSITIVE = "caseSensitive"; //$NON-NLS-1$
+ private static final String STORE_DATA_STRING_REGEX = "stringRegex"; //$NON-NLS-1$
+ private static final String STORE_DATA_FILE_NAMES = "fileNames"; //$NON-NLS-1$
+ private static final String STORE_DATA_FILE_NAME_REGEX = "fileNameRegex"; //$NON-NLS-1$
+ private static final String STORE_DATA_PROFILE_NAME = "profileName"; //$NON-NLS-1$
+ private static final String STORE_DATA_CONNECTION_NAME = "connectionName"; //$NON-NLS-1$
+ private static final String STORE_DATA_FOLDER_NAME = "folderName"; //$NON-NLS-1$
+ private static final String STORE_DATA_INCLUDE_ARCHIVES = "includeArchives"; //$NON-NLS-1$
+ private static final String STORE_DATA_INCLUDE_SUBFOLDERS = "includeSubfolders"; //$NON-NLS-1$
// a list to hold previous searche data
private List previousSearchData = new ArrayList();
@@ -439,7 +439,7 @@ public class SystemSearchPage extends DialogPage implements ISearchPage {
// then we will no longer need to store data in the combo, which is a very inelegant solution
// we can simply parse whatever comes out of getText() and get profile name, connection name
// and folder path
- return connectionName + ":" + folderPath;
+ return connectionName + ":" + folderPath; //$NON-NLS-1$
}
/**
@@ -868,8 +868,8 @@ public class SystemSearchPage extends DialogPage implements ISearchPage {
}
// if text is null, then make it "*"
- if (text == null || text.equals("")) {
- text = "*";
+ if (text == null || text.equals("")) { //$NON-NLS-1$
+ text = "*"; //$NON-NLS-1$
}
// otherwise, make sure to escape the special characters so that we actually search for the
// string with the special characters
@@ -881,7 +881,7 @@ public class SystemSearchPage extends DialogPage implements ISearchPage {
// if the file name is still null, set it to "*"
if (fileName == null) {
- fileName = "*";
+ fileName = "*"; //$NON-NLS-1$
}
// set the file name
@@ -902,8 +902,8 @@ public class SystemSearchPage extends DialogPage implements ISearchPage {
*/
private String insertEscapeChar(String text) {
- if (text == null || text.equals("")) {
- return "";
+ if (text == null || text.equals("")) { //$NON-NLS-1$
+ return ""; //$NON-NLS-1$
}
StringBuffer sbIn = new StringBuffer(text);
@@ -914,7 +914,7 @@ public class SystemSearchPage extends DialogPage implements ISearchPage {
lengthOfFirstLine = reader.readLine().length();
}
catch (IOException ex) {
- return "";
+ return ""; //$NON-NLS-1$
}
StringBuffer sbOut = new StringBuffer(lengthOfFirstLine + 5);
@@ -924,7 +924,7 @@ public class SystemSearchPage extends DialogPage implements ISearchPage {
char ch = sbIn.charAt(i);
if (ch == '*' || ch == '?' || ch == '\\') {
- sbOut.append("\\");
+ sbOut.append("\\"); //$NON-NLS-1$
}
sbOut.append(ch);
@@ -974,7 +974,7 @@ public class SystemSearchPage extends DialogPage implements ISearchPage {
setControl(main);
// set help
- SystemWidgetHelpers.setHelp(main, RSEUIPlugin.HELPPREFIX + "rsdi0000");
+ SystemWidgetHelpers.setHelp(main, RSEUIPlugin.HELPPREFIX + "rsdi0000"); //$NON-NLS-1$
}
/**
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/SystemViewRemoteFileAdapter.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/SystemViewRemoteFileAdapter.java
index 41e017b06d6..a46254dd65f 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/SystemViewRemoteFileAdapter.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/SystemViewRemoteFileAdapter.java
@@ -40,6 +40,10 @@ import org.eclipse.jface.viewers.AbstractTreeViewer;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.rse.core.SystemBasePlugin;
+import org.eclipse.rse.core.model.ISystemMessageObject;
+import org.eclipse.rse.core.model.ISystemResourceSet;
+import org.eclipse.rse.core.model.SystemMessageObject;
+import org.eclipse.rse.core.model.SystemWorkspaceResourceSet;
import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.core.subsystems.RemoteChildrenContentsType;
import org.eclipse.rse.core.subsystems.SubSystem;
@@ -65,14 +69,10 @@ import org.eclipse.rse.files.ui.resources.UniversalFileTransferUtility;
import org.eclipse.rse.filters.ISystemFilterReference;
import org.eclipse.rse.filters.SystemFilterReference;
import org.eclipse.rse.model.IHost;
-import org.eclipse.rse.model.ISystemMessageObject;
import org.eclipse.rse.model.ISystemRegistry;
import org.eclipse.rse.model.ISystemResourceChangeEvents;
-import org.eclipse.rse.model.ISystemResourceSet;
-import org.eclipse.rse.model.SystemMessageObject;
import org.eclipse.rse.model.SystemRemoteResourceSet;
import org.eclipse.rse.model.SystemResourceChangeEvent;
-import org.eclipse.rse.model.SystemWorkspaceResourceSet;
import org.eclipse.rse.services.clientserver.StringCompare;
import org.eclipse.rse.services.clientserver.SystemSearchString;
import org.eclipse.rse.services.clientserver.archiveutils.ArchiveHandlerManager;
@@ -233,10 +233,10 @@ public class SystemViewRemoteFileAdapter
*/
public void setFilterString(String filterString)
{
- if (filesOnly && (filterString != null) && (filterString.indexOf("/ns") == -1))
- filterString = filterString + " /ns";
- else if (foldersOnly && (filterString != null) && (filterString.indexOf("/nf") == -1))
- filterString = filterString + " /nf";
+ if (filesOnly && (filterString != null) && (filterString.indexOf("/ns") == -1)) //$NON-NLS-1$
+ filterString = filterString + " /ns"; //$NON-NLS-1$
+ else if (foldersOnly && (filterString != null) && (filterString.indexOf("/nf") == -1)) //$NON-NLS-1$
+ filterString = filterString + " /nf"; //$NON-NLS-1$
this.filterString = filterString;
}
@@ -577,7 +577,7 @@ public class SystemViewRemoteFileAdapter
*/
public String getStatusLineText(Object element)
{
- return getType(element) + ": " + getAbsoluteName(element);
+ return getType(element) + ": " + getAbsoluteName(element); //$NON-NLS-1$
}
/**
@@ -658,21 +658,21 @@ public class SystemViewRemoteFileAdapter
else if (foldersOnly)
{
if (filterString == null)
- filter = "* /nf";
+ filter = "* /nf"; //$NON-NLS-1$
else
filter = filterString;
}
else if (filesOnly)
{
if (filterString == null)
- filter = "* /ns";
+ filter = "* /ns"; //$NON-NLS-1$
else
filter = filterString;
}
else
{
if (filterString == null)
- filter = "*";
+ filter = "*"; //$NON-NLS-1$
else
filter = filterString;
}
@@ -967,20 +967,20 @@ public class SystemViewRemoteFileAdapter
if (debug)
{
- propertyDescriptorArray[++idx] = createSimplePropertyDescriptor("DEBUG_PARENTREMOTEFILE");
- briefPropertyDescriptorArray[++briefIdx] = createSimplePropertyDescriptor("DEBUG_PARENTREMOTEFILE");
- propertyDescriptorArray[++idx] = createSimplePropertyDescriptor("DEBUG_PARENT");
- briefPropertyDescriptorArray[++briefIdx] = createSimplePropertyDescriptor("DEBUG_PARENT");
- propertyDescriptorArray[++idx] = createSimplePropertyDescriptor("DEBUG_PARENTNOROOT");
- briefPropertyDescriptorArray[++briefIdx] = createSimplePropertyDescriptor("DEBUG_PARENTNOROOT");
- propertyDescriptorArray[++idx] = createSimplePropertyDescriptor("DEBUG_PARENTNAME");
- briefPropertyDescriptorArray[++briefIdx] = createSimplePropertyDescriptor("DEBUG_PARENTNAME");
- propertyDescriptorArray[++idx] = createSimplePropertyDescriptor("DEBUG_ROOT");
- briefPropertyDescriptorArray[++briefIdx] = createSimplePropertyDescriptor("DEBUG_ROOT");
- propertyDescriptorArray[++idx] = createSimplePropertyDescriptor("DEBUG_ISROOT");
- briefPropertyDescriptorArray[++briefIdx] = createSimplePropertyDescriptor("DEBUG_ISROOT");
- propertyDescriptorArray[++idx] = createSimplePropertyDescriptor("DEBUG_EXISTS");
- briefPropertyDescriptorArray[++briefIdx] = createSimplePropertyDescriptor("DEBUG_EXISTS");
+ propertyDescriptorArray[++idx] = createSimplePropertyDescriptor("DEBUG_PARENTREMOTEFILE"); //$NON-NLS-1$
+ briefPropertyDescriptorArray[++briefIdx] = createSimplePropertyDescriptor("DEBUG_PARENTREMOTEFILE"); //$NON-NLS-1$
+ propertyDescriptorArray[++idx] = createSimplePropertyDescriptor("DEBUG_PARENT"); //$NON-NLS-1$
+ briefPropertyDescriptorArray[++briefIdx] = createSimplePropertyDescriptor("DEBUG_PARENT"); //$NON-NLS-1$
+ propertyDescriptorArray[++idx] = createSimplePropertyDescriptor("DEBUG_PARENTNOROOT"); //$NON-NLS-1$
+ briefPropertyDescriptorArray[++briefIdx] = createSimplePropertyDescriptor("DEBUG_PARENTNOROOT"); //$NON-NLS-1$
+ propertyDescriptorArray[++idx] = createSimplePropertyDescriptor("DEBUG_PARENTNAME"); //$NON-NLS-1$
+ briefPropertyDescriptorArray[++briefIdx] = createSimplePropertyDescriptor("DEBUG_PARENTNAME"); //$NON-NLS-1$
+ propertyDescriptorArray[++idx] = createSimplePropertyDescriptor("DEBUG_ROOT"); //$NON-NLS-1$
+ briefPropertyDescriptorArray[++briefIdx] = createSimplePropertyDescriptor("DEBUG_ROOT"); //$NON-NLS-1$
+ propertyDescriptorArray[++idx] = createSimplePropertyDescriptor("DEBUG_ISROOT"); //$NON-NLS-1$
+ briefPropertyDescriptorArray[++briefIdx] = createSimplePropertyDescriptor("DEBUG_ISROOT"); //$NON-NLS-1$
+ propertyDescriptorArray[++idx] = createSimplePropertyDescriptor("DEBUG_EXISTS"); //$NON-NLS-1$
+ briefPropertyDescriptorArray[++briefIdx] = createSimplePropertyDescriptor("DEBUG_EXISTS"); //$NON-NLS-1$
}
if (isVirtual)
@@ -1069,26 +1069,26 @@ public class SystemViewRemoteFileAdapter
}
if (debug)
{
- if (name.equals("DEBUG_PARENTREMOTEFILE"))
+ if (name.equals("DEBUG_PARENTREMOTEFILE")) //$NON-NLS-1$
{
IRemoteFile parent = file.getParentRemoteFile();
if (parent == null)
- return "null";
+ return "null"; //$NON-NLS-1$
else
- return "absPath='" + parent.getAbsolutePath() + "'";
+ return "absPath='" + parent.getAbsolutePath() + "'"; //$NON-NLS-1$ //$NON-NLS-2$
}
- else if (name.equals("DEBUG_PARENT"))
+ else if (name.equals("DEBUG_PARENT")) //$NON-NLS-1$
return file.getParentPath();
- else if (name.equals("DEBUG_PARENTNOROOT"))
+ else if (name.equals("DEBUG_PARENTNOROOT")) //$NON-NLS-1$
return file.getParentNoRoot();
- else if (name.equals("DEBUG_PARENTNAME"))
+ else if (name.equals("DEBUG_PARENTNAME")) //$NON-NLS-1$
return file.getParentName();
- else if (name.equals("DEBUG_ROOT"))
+ else if (name.equals("DEBUG_ROOT")) //$NON-NLS-1$
return file.getRoot();
- else if (name.equals("DEBUG_ISROOT"))
- return file.isRoot() ? "true" : "false";
- else if (name.equals("DEBUG_EXISTS"))
- return file.exists() ? "true" : "false";
+ else if (name.equals("DEBUG_ISROOT")) //$NON-NLS-1$
+ return file.isRoot() ? "true" : "false"; //$NON-NLS-1$ //$NON-NLS-2$
+ else if (name.equals("DEBUG_EXISTS")) //$NON-NLS-1$
+ return file.exists() ? "true" : "false"; //$NON-NLS-1$ //$NON-NLS-2$
}
//
@@ -1182,7 +1182,7 @@ public class SystemViewRemoteFileAdapter
}
else if (name.equals(ISystemPropertyConstants.P_VIRTUAL_COMPRESSIONMETHOD))
{
- if (!isVirtual) return "";
+ if (!isVirtual) return ""; //$NON-NLS-1$
return virtualFile.getCompressionMethod();
}
else if (name.equals(ISystemPropertyConstants.P_VIRTUAL_COMPRESSIONRATIO))
@@ -1368,7 +1368,6 @@ public class SystemViewRemoteFileAdapter
* set. For optimal performance, this should be overridden.
*
* @param set the set of objects to copy
- * @param sameSystemType indication of whether the source and target reside on the same type of system
* @param monitor the progress monitor
* @return a temporary workspace copies of the object that was copied
*
@@ -1432,7 +1431,7 @@ public class SystemViewRemoteFileAdapter
{
IHost connection = connections[i];
IRemoteFileSubSystem anFS = RemoteFileUtility.getFileSubSystem(connection);
- if (anFS.getHost().getSystemType().equals("Local"))
+ if (anFS.getHost().getSystemType().equals("Local")) //$NON-NLS-1$
{
return anFS;
}
@@ -1454,7 +1453,7 @@ public class SystemViewRemoteFileAdapter
{
FileServiceSubSystem ss = (FileServiceSubSystem)subsys;
- SystemSearchString searchString = new SystemSearchString("*", false, false, "*", false, false, true);
+ SystemSearchString searchString = new SystemSearchString("*", false, false, "*", false, false, true); //$NON-NLS-1$ //$NON-NLS-2$
for (int i = 0; i < initialResources.size(); i++)
{
@@ -1626,8 +1625,8 @@ public class SystemViewRemoteFileAdapter
/**
* Perform drop from the "fromSet" of objects to the "to" object
- * @param from the source objects for the drop
- * @param to the target object for the drop
+ * @param fromSet the source objects for the drop
+ * @param target the target object for the drop
* @param sameSystemType indication of whether the source and target reside of the same type of system
* @param sameSystem indication of whether the source and target are on the same system
* @param srcType the type of objects to be dropped
@@ -1885,7 +1884,7 @@ public class SystemViewRemoteFileAdapter
* temporary object produced by the doDrag.
* @param target the object to be copied to.
* @param sameSystem an indication whether the target and source reside on the same type of system
- * @param srcType type of source being transferred
+ * @param sourceType type of source being transferred
* @param monitor the progress monitor
* @return an indication whether the operation was successful or not.
*/
@@ -2356,7 +2355,7 @@ public class SystemViewRemoteFileAdapter
for (int i = 0; i < members.length; i++)
{
IResource member = members[i];
- moveTempFileProperties(member, ss, remotePath + "/" + member.getName());
+ moveTempFileProperties(member, ss, remotePath + "/" + member.getName()); //$NON-NLS-1$
}
}
catch (Exception e)
@@ -2400,7 +2399,7 @@ public class SystemViewRemoteFileAdapter
try
{
- String newRemotePath = file.getParentPath() + "/" + newName;
+ String newRemotePath = file.getParentPath() + "/" + newName; //$NON-NLS-1$
IResource localResource = null;
if (SystemRemoteEditManager.getDefault().doesRemoteEditProjectExist())
{
@@ -2607,9 +2606,9 @@ public class SystemViewRemoteFileAdapter
{
srcType = file.getExtension();
if (srcType == null)
- srcType = "blank";
+ srcType = "blank"; //$NON-NLS-1$
else if (srcType.length() == 0)
- srcType = "null";
+ srcType = "null"; //$NON-NLS-1$
}
return srcType;
}
@@ -2828,7 +2827,7 @@ public class SystemViewRemoteFileAdapter
IRemoteFile remoteFile = (IRemoteFile) object;
if (remoteFile.isDirectory())
{
- return remoteFile.getAbsolutePath() + remoteFile.getSeparator() + "*";
+ return remoteFile.getAbsolutePath() + remoteFile.getSeparator() + "*"; //$NON-NLS-1$
}
else
{
@@ -2881,7 +2880,7 @@ public class SystemViewRemoteFileAdapter
String inName = name.toLowerCase();
- if (inName.equals("classification"))
+ if (inName.equals("classification")) //$NON-NLS-1$
{
String classification = tgt.getClassification();
@@ -2890,7 +2889,7 @@ public class SystemViewRemoteFileAdapter
return StringCompare.compare(value, classification, true);
}
}
- else if (inName.equals("name"))
+ else if (inName.equals("name")) //$NON-NLS-1$
{
boolean caseSensitive = tgt.getParentRemoteFileSubSystem().isCaseSensitive();
@@ -2904,14 +2903,14 @@ public class SystemViewRemoteFileAdapter
}
// we have a wild card test, and * is the last character in the value
- if (val.endsWith("*")) {
+ if (val.endsWith("*")) { //$NON-NLS-1$
return tgtName.startsWith(val.substring(0, val.length()-1));
}
else {
return val.equals(tgtName);
}
}
- else if (inName.equals("absolutePath".toLowerCase())) {
+ else if (inName.equals("absolutePath".toLowerCase())) { //$NON-NLS-1$
boolean caseSensitive = tgt.getParentRemoteFileSubSystem().isCaseSensitive();
@@ -2925,14 +2924,14 @@ public class SystemViewRemoteFileAdapter
}
// we have a wild card test, and * is the last character in the value
- if (val.endsWith("*")) {
+ if (val.endsWith("*")) { //$NON-NLS-1$
return tgtPath.startsWith(val.substring(0, val.length()-1));
}
else {
return val.equals(tgtPath);
}
}
- else if (inName.equals("extension")) {
+ else if (inName.equals("extension")) { //$NON-NLS-1$
boolean caseSensitive = tgt.getParentRemoteFileSubSystem().isCaseSensitive();
@@ -2942,7 +2941,7 @@ public class SystemViewRemoteFileAdapter
return false;
}
- StringTokenizer st = new StringTokenizer(value, " \t\n\r\f,");
+ StringTokenizer st = new StringTokenizer(value, " \t\n\r\f,"); //$NON-NLS-1$
String val = null;
@@ -2960,7 +2959,7 @@ public class SystemViewRemoteFileAdapter
// we have a wild card test, and * is the last character in
// the value
- if (val.endsWith("*")) {
+ if (val.endsWith("*")) { //$NON-NLS-1$
match = tgtExtension.startsWith(val.substring(0, val.length() - 1));
}
else {
@@ -2976,64 +2975,64 @@ public class SystemViewRemoteFileAdapter
// return false if no match
return false;
}
- else if (inName.equals("isroot"))
+ else if (inName.equals("isroot")) //$NON-NLS-1$
{
- return tgt.isRoot() && value.equals("true") ||
- !tgt.isRoot() && value.equals("false");
+ return tgt.isRoot() && value.equals("true") || //$NON-NLS-1$
+ !tgt.isRoot() && value.equals("false"); //$NON-NLS-1$
}
- else if (inName.equals("isfile"))
+ else if (inName.equals("isfile")) //$NON-NLS-1$
{
- return tgt.isFile() && value.equals("true") ||
- !tgt.isFile() && value.equals("false");
+ return tgt.isFile() && value.equals("true") || //$NON-NLS-1$
+ !tgt.isFile() && value.equals("false"); //$NON-NLS-1$
}
- else if (inName.equals("isdirectory"))
+ else if (inName.equals("isdirectory")) //$NON-NLS-1$
{
- return tgt.isDirectory() && value.equals("true") ||
- !tgt.isDirectory() && value.equals("false");
+ return tgt.isDirectory() && value.equals("true") || //$NON-NLS-1$
+ !tgt.isDirectory() && value.equals("false"); //$NON-NLS-1$
}
- else if (inName.equals("ishidden"))
+ else if (inName.equals("ishidden")) //$NON-NLS-1$
{
- return tgt.isHidden() && value.equals("true") ||
- !tgt.isHidden() && value.equals("false");
+ return tgt.isHidden() && value.equals("true") || //$NON-NLS-1$
+ !tgt.isHidden() && value.equals("false"); //$NON-NLS-1$
}
- else if (inName.equals("canread"))
+ else if (inName.equals("canread")) //$NON-NLS-1$
{
- return tgt.canRead() && value.equals("true") ||
- !tgt.canRead() && value.equals("false");
+ return tgt.canRead() && value.equals("true") || //$NON-NLS-1$
+ !tgt.canRead() && value.equals("false"); //$NON-NLS-1$
}
- else if (inName.equals("canwrite"))
+ else if (inName.equals("canwrite")) //$NON-NLS-1$
{
- return tgt.canWrite() && value.equals("true") ||
- !tgt.canWrite() && value.equals("false");
+ return tgt.canWrite() && value.equals("true") || //$NON-NLS-1$
+ !tgt.canWrite() && value.equals("false"); //$NON-NLS-1$
}
- else if (inName.equals("isbinary"))
+ else if (inName.equals("isbinary")) //$NON-NLS-1$
{
- return tgt.isBinary() && value.equals("true") ||
- !tgt.isBinary() && value.equals("false");
+ return tgt.isBinary() && value.equals("true") || //$NON-NLS-1$
+ !tgt.isBinary() && value.equals("false"); //$NON-NLS-1$
}
- else if (inName.equals("istext"))
+ else if (inName.equals("istext")) //$NON-NLS-1$
{
- return tgt.isText() && value.equals("true") ||
- !tgt.isText() && value.equals("false");
+ return tgt.isText() && value.equals("true") || //$NON-NLS-1$
+ !tgt.isText() && value.equals("false"); //$NON-NLS-1$
}
else if (inName.equals("isarchive")) {
- return tgt.isArchive() && value.equals("true") ||
- !tgt.isArchive() && value.equals("false");
+ return tgt.isArchive() && value.equals("true") || //$NON-NLS-1$
+ !tgt.isArchive() && value.equals("false"); //$NON-NLS-1$
}
- else if (inName.equals("isvirtual"))
+ else if (inName.equals("isvirtual")) //$NON-NLS-1$
{
- return tgt instanceof IVirtualRemoteFile && value.equals("true") ||
- !(tgt instanceof IVirtualRemoteFile) && value.equals("false");
+ return tgt instanceof IVirtualRemoteFile && value.equals("true") || //$NON-NLS-1$
+ !(tgt instanceof IVirtualRemoteFile) && value.equals("false"); //$NON-NLS-1$
}
- else if (inName.equals("isexecutable"))
+ else if (inName.equals("isexecutable")) //$NON-NLS-1$
{
- return tgt.isExecutable() && value.equals("true") ||
- !tgt.isExecutable() && value.equals("false");
+ return tgt.isExecutable() && value.equals("true") || //$NON-NLS-1$
+ !tgt.isExecutable() && value.equals("false"); //$NON-NLS-1$
}
- else if (inName.equals("islink"))
+ else if (inName.equals("islink")) //$NON-NLS-1$
{
- return tgt.isLink() && value.equals("true") ||
- !tgt.isLink() && value.equals("false");
+ return tgt.isLink() && value.equals("true") || //$NON-NLS-1$
+ !tgt.isLink() && value.equals("false"); //$NON-NLS-1$
}
}
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemQualifiedRemoteFolderCombo.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemQualifiedRemoteFolderCombo.java
index 3f6ed59e44c..c936ee67a5c 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemQualifiedRemoteFolderCombo.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemQualifiedRemoteFolderCombo.java
@@ -736,7 +736,7 @@ public class SystemQualifiedRemoteFolderCombo extends Composite
IRemoteFile folder = browseAction.getSelectedFolder();
if (folder != null)
setFolder(folder);
- };
+ }
};
browseButton.addSelectionListener(selectionListener);
}
@@ -763,9 +763,9 @@ public class SystemQualifiedRemoteFolderCombo extends Composite
}
protected static Button createPushButton(Composite group, ResourceBundle bundle, String key)
{
- String label = bundle.getString(key+"label");
+ String label = bundle.getString(key+"label"); //$NON-NLS-1$
Button button = createPushButton(group,label);
- button.setToolTipText(bundle.getString(key+"tooltip"));
+ button.setToolTipText(bundle.getString(key+"tooltip")); //$NON-NLS-1$
return button;
}
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemRemoteConnectionCombo.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemRemoteConnectionCombo.java
index ba0a9a7c47b..7aae6c6305d 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemRemoteConnectionCombo.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemRemoteConnectionCombo.java
@@ -47,7 +47,6 @@ public class SystemRemoteConnectionCombo extends SystemHostCombo {
/**
* Constructor when you don't care about the style. Defaults to SWT.NULL.
* @param parent Parent composite.
- * @param style SWT style flags for overall composite widget. Typically just pass SWT.NULL.
* @param defaultConnection the system connection to preselect. Pass null to preselect first connection.
* @param showNewButton true if a New... button is to be included in this composite.
*/
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemRemoteFolderCombo.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemRemoteFolderCombo.java
index e36e9f8e7d6..3a4512057aa 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemRemoteFolderCombo.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemRemoteFolderCombo.java
@@ -531,7 +531,7 @@ public class SystemRemoteFolderCombo extends Composite implements ISystemCombo
// we notify even if the suer cancelled and the folder is null so listeners
// know that the brose dialog was cancelled
notifyBrowseActionCompleteListeners(folder);
- };
+ }
};
browseButton.addSelectionListener(selectionListener);
}
@@ -559,9 +559,9 @@ public class SystemRemoteFolderCombo extends Composite implements ISystemCombo
}
protected static Button createPushButton(Composite group, ResourceBundle bundle, String key)
{
- String label = bundle.getString(key+"label");
+ String label = bundle.getString(key+"label"); //$NON-NLS-1$
Button button = createPushButton(group,label);
- button.setToolTipText(bundle.getString(key+"tooltip"));
+ button.setToolTipText(bundle.getString(key+"tooltip")); //$NON-NLS-1$
return button;
}
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemSelectRemoteFileOrFolderForm.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemSelectRemoteFileOrFolderForm.java
index b04ad7f936e..a2f0fbedff3 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemSelectRemoteFileOrFolderForm.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemSelectRemoteFileOrFolderForm.java
@@ -113,7 +113,7 @@ public class SystemSelectRemoteFileOrFolderForm
protected ISystemRegistry sr = null;
protected String verbage = null;
protected String treeTip = null;
- protected String locationPrompt = "";
+ protected String locationPrompt = ""; //$NON-NLS-1$
protected String fileTypes;
protected boolean fileMode;
protected boolean valid = true;
@@ -177,8 +177,8 @@ public class SystemSelectRemoteFileOrFolderForm
// create the input provider that drives the contents of the tree
inputProvider = getInputProvider();
- String initialFilterString = "*"; // change to "*" for defect 43492
- inputProvider.setFilterString(fileMode ? initialFilterString : initialFilterString+" /nf");
+ String initialFilterString = "*"; // change to "*" for defect 43492 //$NON-NLS-1$
+ inputProvider.setFilterString(fileMode ? initialFilterString : initialFilterString+" /nf"); //$NON-NLS-1$
// create object matcher
if (fileMode)
@@ -390,9 +390,9 @@ public class SystemSelectRemoteFileOrFolderForm
/**/
// it might be a bug, bug when asking for the parent of '/', I get back '/'!!!
if ((parentFolder != null) &&
- (selection.getAbsolutePath().equals("/") &&
+ (selection.getAbsolutePath().equals("/") && //$NON-NLS-1$
(parentFolder.getAbsolutePath()!=null) &&
- parentFolder.getAbsolutePath().equals("/")))
+ parentFolder.getAbsolutePath().equals("/"))) //$NON-NLS-1$
parentFolder = null;
if (parentFolder != null)
{
@@ -435,7 +435,7 @@ public class SystemSelectRemoteFileOrFolderForm
public void setFileTypes(String fileTypes)
{
this.fileTypes = fileTypes;
- inputProvider.setFilterString("/"+ fileTypes);
+ inputProvider.setFilterString("/"+ fileTypes); //$NON-NLS-1$
}
/**
* Specify the zero-based auto-expand level for the tree. The default is zero, meaning
@@ -651,8 +651,8 @@ public class SystemSelectRemoteFileOrFolderForm
((GridData)ps_composite.getLayoutData()).verticalAlignment = GridData.FILL;
// SPACER LINES
- spacer1 = SystemWidgetHelpers.createLabel(ps_composite, "", 1);
- spacer2 = SystemWidgetHelpers.createLabel(ps_composite, "", 1);
+ spacer1 = SystemWidgetHelpers.createLabel(ps_composite, "", 1); //$NON-NLS-1$
+ spacer2 = SystemWidgetHelpers.createLabel(ps_composite, "", 1); //$NON-NLS-1$
// PROPERTY SHEET VIEWER
ps = new SystemPropertySheetForm(shell, ps_composite, SWT.BORDER, msgLine);
}
@@ -703,7 +703,7 @@ public class SystemSelectRemoteFileOrFolderForm
//verbageLabel = SystemWidgetHelpers.createLabel(composite_prompts, verbage, gridColumns);
// SPACER LINE
- SystemWidgetHelpers.createLabel(composite_prompts, "", gridColumns);
+ SystemWidgetHelpers.createLabel(composite_prompts, "", gridColumns); //$NON-NLS-1$
// LOCATION PROMPT
if (showLocationPrompt)
@@ -848,7 +848,7 @@ public class SystemSelectRemoteFileOrFolderForm
if ((selectionSize > 1) && !tree.sameParent() && !allowForMultipleParents)
{
clearErrorMessage();
- setNameText("");
+ setNameText(""); //$NON-NLS-1$
setPageComplete();
return; // don't enable OK/Add if selections from different parents
}
@@ -862,7 +862,7 @@ public class SystemSelectRemoteFileOrFolderForm
return;
}
clearErrorMessage();
- setNameText("");
+ setNameText(""); //$NON-NLS-1$
setPageComplete();
previousSelection = selectedObject;
if (selectedObject != null)
diff --git a/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/view/SystemViewRemoteProcessAdapter.java b/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/view/SystemViewRemoteProcessAdapter.java
index b543c492d02..bdf188a334a 100644
--- a/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/view/SystemViewRemoteProcessAdapter.java
+++ b/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/view/SystemViewRemoteProcessAdapter.java
@@ -21,10 +21,10 @@ import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.rse.core.SystemBasePlugin;
+import org.eclipse.rse.core.model.ISystemMessageObject;
+import org.eclipse.rse.core.model.ISystemResourceSet;
+import org.eclipse.rse.core.model.SystemMessageObject;
import org.eclipse.rse.core.subsystems.ISubSystem;
-import org.eclipse.rse.model.ISystemMessageObject;
-import org.eclipse.rse.model.ISystemResourceSet;
-import org.eclipse.rse.model.SystemMessageObject;
import org.eclipse.rse.model.SystemRemoteResourceSet;
import org.eclipse.rse.processes.ui.ProcessesPlugin;
import org.eclipse.rse.processes.ui.actions.SystemKillProcessAction;
@@ -107,13 +107,13 @@ public class SystemViewRemoteProcessAdapter extends AbstractSystemViewAdapter
public ImageDescriptor getImageDescriptor(Object element)
{
//return RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_PROCESS_ID);
- return ProcessesPlugin.getDefault().getImageDescriptorFromPath("icons/full/obj16/activeprocess_obj.gif");
+ return ProcessesPlugin.getDefault().getImageDescriptorFromPath("icons/full/obj16/activeprocess_obj.gif"); //$NON-NLS-1$
}
public String getText(Object element)
{
String text = ((IRemoteProcess) element).getLabel();
- return (text == null) ? "" : text;
+ return (text == null) ? "" : text; //$NON-NLS-1$
}
/**
@@ -129,7 +129,7 @@ public class SystemViewRemoteProcessAdapter extends AbstractSystemViewAdapter
public String getAbsoluteName(Object object)
{
IRemoteProcess process = (IRemoteProcess) object;
- return "" + process.getPid();
+ return "" + process.getPid(); //$NON-NLS-1$
}
public String getType(Object element)
@@ -259,7 +259,7 @@ public class SystemViewRemoteProcessAdapter extends AbstractSystemViewAdapter
{
if (formatted)
{
- return "" + process.getGid();
+ return "" + process.getGid(); //$NON-NLS-1$
}
else
{
@@ -274,7 +274,7 @@ public class SystemViewRemoteProcessAdapter extends AbstractSystemViewAdapter
{
if (formatted)
{
- return "" + process.getPid();
+ return "" + process.getPid(); //$NON-NLS-1$
}
else
{
@@ -285,7 +285,7 @@ public class SystemViewRemoteProcessAdapter extends AbstractSystemViewAdapter
{
if (formatted)
{
- return "" + process.getPPid();
+ return "" + process.getPPid(); //$NON-NLS-1$
}
else
{
@@ -307,7 +307,7 @@ public class SystemViewRemoteProcessAdapter extends AbstractSystemViewAdapter
{
if (formatted)
{
- return "" + process.getTgid();
+ return "" + process.getTgid(); //$NON-NLS-1$
}
else
{
@@ -318,7 +318,7 @@ public class SystemViewRemoteProcessAdapter extends AbstractSystemViewAdapter
{
if (formatted)
{
- return "" + process.getTracerPid();
+ return "" + process.getTracerPid(); //$NON-NLS-1$
}
else
{
@@ -329,7 +329,7 @@ public class SystemViewRemoteProcessAdapter extends AbstractSystemViewAdapter
{
if (formatted)
{
- return "" + process.getUid();
+ return "" + process.getUid(); //$NON-NLS-1$
}
else
{
@@ -368,18 +368,18 @@ public class SystemViewRemoteProcessAdapter extends AbstractSystemViewAdapter
protected String formatState(String state)
{
- if (state == null) return "";
+ if (state == null) return ""; //$NON-NLS-1$
state = state.trim();
- String longState = "";
- String[] allStates = state.split(",");
+ String longState = ""; //$NON-NLS-1$
+ String[] allStates = state.split(","); //$NON-NLS-1$
if (allStates == null) return longState;
SystemProcessStatesContentProvider zstates = new SystemProcessStatesContentProvider();
for (int i = 0; i < allStates.length; i++)
{
- longState = longState + allStates[i].charAt(0) + "-" + zstates.getStateString(allStates[i]);
+ longState = longState + allStates[i].charAt(0) + "-" + zstates.getStateString(allStates[i]); //$NON-NLS-1$
if (i < allStates.length - 1)
- longState = longState + ", ";
+ longState = longState + ", "; //$NON-NLS-1$
}
return longState;
}
@@ -392,7 +392,7 @@ public class SystemViewRemoteProcessAdapter extends AbstractSystemViewAdapter
IRemoteProcess process = (IRemoteProcess) element;
IRemoteProcess parent = process.getParentRemoteProcess();
if (parent != null) return parent.getAbsolutePath();
- else return "/proc/0";
+ else return "/proc/0"; //$NON-NLS-1$
}
/**
@@ -422,8 +422,8 @@ public class SystemViewRemoteProcessAdapter extends AbstractSystemViewAdapter
String[] pids = EMPTY_STRING_LIST;
IRemoteProcess process = (IRemoteProcess) element;
- String parentName = "" + process.getPPid();
- if (parentName.equals("-1")) // given a root?
+ String parentName = "" + process.getPPid(); //$NON-NLS-1$
+ if (parentName.equals("-1")) // given a root? //$NON-NLS-1$
return pids; // not much we can do. Should never happen: you can't rename a root!
Object[] children = getChildren(process.getParentRemoteProcess());
@@ -432,7 +432,7 @@ public class SystemViewRemoteProcessAdapter extends AbstractSystemViewAdapter
pids = new String[children.length];
for (int idx = 0; idx < pids.length; idx++)
- pids[idx] = "" + ((IRemoteProcess) children[idx]).getPid();
+ pids[idx] = "" + ((IRemoteProcess) children[idx]).getPid(); //$NON-NLS-1$
return pids;
}
diff --git a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/RemoteCommandHelpers.java b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/RemoteCommandHelpers.java
index d33b4de1c2c..d8bf4f30223 100644
--- a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/RemoteCommandHelpers.java
+++ b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/RemoteCommandHelpers.java
@@ -141,17 +141,17 @@ public class RemoteCommandHelpers
{
if (path.indexOf(' ') > 0)
{
- path = "\"" + path + "\"";
+ path = "\"" + path + "\""; //$NON-NLS-1$ //$NON-NLS-2$
}
- String cdCmd = "cd " + path;
+ String cdCmd = "cd " + path; //$NON-NLS-1$
if (!fileSSF.isUnixStyle())
{
- if (path.endsWith(":"))
+ if (path.endsWith(":")) //$NON-NLS-1$
{
- path += "\\";
+ path += "\\"; //$NON-NLS-1$
}
- cdCmd = "cd /d " + path;
+ cdCmd = "cd /d " + path; //$NON-NLS-1$
}
cmdSubSystem.sendCommandToShell(cdCmd, shell, defaultShell);
diff --git a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/SystemRemoteCommandEntryForm.java b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/SystemRemoteCommandEntryForm.java
index 15049c63394..eb165ddb8a1 100644
--- a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/SystemRemoteCommandEntryForm.java
+++ b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/SystemRemoteCommandEntryForm.java
@@ -16,8 +16,8 @@
package org.eclipse.rse.shells.ui;
import org.eclipse.rse.core.SystemBasePlugin;
+import org.eclipse.rse.core.model.ISubSystemConfigurationCategories;
import org.eclipse.rse.model.IHost;
-import org.eclipse.rse.model.ISubSystemConfigurationCategories;
import org.eclipse.rse.model.ISystemResourceChangeEvent;
import org.eclipse.rse.model.ISystemResourceChangeEvents;
import org.eclipse.rse.subsystems.files.core.model.ISystemRemoteCommand;
@@ -75,7 +75,7 @@ public class SystemRemoteCommandEntryForm extends Composite
public void widgetSelected(SelectionEvent event)
{
sysConnChanged();
- };
+ }
});
sysConnCombo.listenToConnectionEvents(true);
diff --git a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/actions/SystemCommandAction.java b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/actions/SystemCommandAction.java
index 5f691ad683e..1520a6ef7d5 100644
--- a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/actions/SystemCommandAction.java
+++ b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/actions/SystemCommandAction.java
@@ -130,7 +130,7 @@ public class SystemCommandAction extends SystemBaseAction
_cmdText = new Combo(c, SWT.SINGLE | SWT.BORDER);
GridData textData = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
_cmdText.setLayoutData(textData);
- _cmdText.setText("");
+ _cmdText.setText(""); //$NON-NLS-1$
_cmdText.setToolTipText(ShellResources.RESID_SHELLS_COMMAND_TOOLTIP);
// add keystroke listeners...
@@ -173,7 +173,7 @@ public class SystemCommandAction extends SystemBaseAction
private void setHelp()
{
- setHelp(RSEUIPlugin.HELPPREFIX + "cmdi0000");
+ setHelp(RSEUIPlugin.HELPPREFIX + "cmdi0000"); //$NON-NLS-1$
}
/**
@@ -288,9 +288,9 @@ public class SystemCommandAction extends SystemBaseAction
_isShell = isShell;
_cmdSubSystem = cmdSubSystem;
if (_isShell)
- setHelp(RSEUIPlugin.HELPPREFIX+"actn0113");
+ setHelp(RSEUIPlugin.HELPPREFIX+"actn0113"); //$NON-NLS-1$
else
- setHelp(RSEUIPlugin.HELPPREFIX+"actn0114");
+ setHelp(RSEUIPlugin.HELPPREFIX+"actn0114"); //$NON-NLS-1$
}
public void setSubSystem(IRemoteCmdSubSystem ss)
@@ -418,11 +418,11 @@ public class SystemCommandAction extends SystemBaseAction
showInView(defaultShell);
}
- String cdCmd = "cd " + path;
- if ((cmdSubSystem.getHost().getSystemType().equals("Local") && System.getProperty("os.name").toLowerCase().startsWith("win"))
- || cmdSubSystem.getHost().getSystemType().equals("Windows"))
+ String cdCmd = "cd " + path; //$NON-NLS-1$
+ if ((cmdSubSystem.getHost().getSystemType().equals("Local") && System.getProperty("os.name").toLowerCase().startsWith("win")) //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ || cmdSubSystem.getHost().getSystemType().equals("Windows")) //$NON-NLS-1$
{
- cdCmd = "cd /d " + path;
+ cdCmd = "cd /d " + path; //$NON-NLS-1$
}
cmdSubSystem.sendCommandToShell(cdCmd, shell, defaultShell);
cmdSubSystem.sendCommandToShell(cmd, shell, defaultShell);
diff --git a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemCommandsViewPart.java b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemCommandsViewPart.java
index d0c08d52b1e..6967cddfff5 100644
--- a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemCommandsViewPart.java
+++ b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemCommandsViewPart.java
@@ -276,7 +276,7 @@ public class SystemCommandsViewPart
private IStatusLineManager _statusLine = null;
// constants
- public static final String ID = "org.eclipse.rse.shells.ui.view.commandsView";
+ public static final String ID = "org.eclipse.rse.shells.ui.view.commandsView"; //$NON-NLS-1$
// matches id in plugin.xml, view tag
public void setFocus()
@@ -312,7 +312,7 @@ public class SystemCommandsViewPart
selectionService.addSelectionListener(this);
- SystemWidgetHelpers.setHelp(_folder, RSEUIPlugin.HELPPREFIX + "ucmd0000");
+ SystemWidgetHelpers.setHelp(_folder, RSEUIPlugin.HELPPREFIX + "ucmd0000"); //$NON-NLS-1$
ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry();
@@ -369,7 +369,7 @@ public class SystemCommandsViewPart
}
else
{
- _printTableAction.setTableView("", null);
+ _printTableAction.setTableView("", null); //$NON-NLS-1$
}
_clearAction.checkEnabledState();
@@ -514,7 +514,7 @@ public class SystemCommandsViewPart
for (int i = 0; i < connections.length; i++)
{
IHost connection = connections[i];
- if (registry.isAnySubSystemConnected(connection) || connection.getSystemType().equals("Local"))
+ if (registry.isAnySubSystemConnected(connection) || connection.getSystemType().equals("Local")) //$NON-NLS-1$
{
IRemoteCmdSubSystem[] cmdSubSystems = RemoteCommandHelpers.getCmdSubSystems(connection);
if (cmdSubSystems.length == 1)
@@ -639,7 +639,7 @@ public class SystemCommandsViewPart
for (int i = 0; i < connections.length; i++)
{
IHost connection = connections[i];
- if (registry.isAnySubSystemConnected(connection) || connection.getSystemType().equals("Local"))
+ if (registry.isAnySubSystemConnected(connection) || connection.getSystemType().equals("Local")) //$NON-NLS-1$
{
IRemoteCmdSubSystem[] cmdSubSystems = RemoteCommandHelpers.getCmdSubSystems(connection);
if (cmdSubSystems.length > 0)
diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/model/RemotePath.java b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/model/RemotePath.java
index 2b578c5071a..1a2bec00f1c 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/model/RemotePath.java
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/model/RemotePath.java
@@ -54,7 +54,7 @@ public class RemotePath implements IRemotePath {
* Sets the profile name, connection name and absolute path on the remote machine
* from the fully qualified path. The fully qualified path is the absolute path on the remote machine,
* prefixed by profile name and connection name. It must be of the form
* After creating the widget, call setLocal to set initial state, and setInheritedText/setLocalText to set inherited/local text
* @param parent composite to put the button into.
- * @param tooltip text for the toggle. Can be null
- * @param tooltip text for the entry field. Can be null
+ * @param toggleToolTip text for the toggle. Can be null
+ * @param entryToolTip text for the entry field. Can be null
* @return The text field widget
*/
public static InheritableEntryField createInheritableTextField(Composite parent, String toggleToolTip, String entryToolTip)
@@ -1308,7 +1308,7 @@ public class SystemWidgetHelpers {
* Given an SWT Menu, "walk it" and automatically assign unique
* mnemonics for every menu item in it, and then for each
* submenu, do so for it too.
- * @param the menubar to add mnemonics for
+ * @param menu the menubar to add mnemonics for
*/
public static void setMnemonics(Menu menu) {
Mnemonics mnemonics = new Mnemonics(); // instance of this class to get unique mnemonics FOR THIS MENU ONLY
@@ -1389,7 +1389,7 @@ public class SystemWidgetHelpers {
boolean strip = false;
Locale currentLocale = Locale.getDefault();
String language = currentLocale.getLanguage();
- boolean cjk = language.equals("zh") || language.equals("ja") || language.equals("ko");
+ boolean cjk = language.equals("zh") || language.equals("ja") || language.equals("ko"); //$NON-NLS-1$ //$NON-NLS-2$
int n = result.length();
if (n > 0) {
char lastCharacter = label.charAt(n - 1);
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemAbstractPopupMenuExtensionAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemAbstractPopupMenuExtensionAction.java
index 15ff274141d..2496db749c9 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemAbstractPopupMenuExtensionAction.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemAbstractPopupMenuExtensionAction.java
@@ -360,31 +360,27 @@ public abstract class SystemAbstractPopupMenuExtensionAction
return conn;
}
-
-
-
-
/**
* Debug method to print out details of given selected object...
*/
public void printTest()
{
- System.out.println("Testing. Number of selected objects = "+getSelectionCount());
+ System.out.println("Testing. Number of selected objects = "+getSelectionCount()); //$NON-NLS-1$
Object obj = getFirstSelectedRemoteObject();
if (obj == null)
- System.out.println("selected obj is null");
+ System.out.println("selected obj is null"); //$NON-NLS-1$
else
{
ISystemRemoteElementAdapter adapter = getRemoteAdapter(obj);
System.out.println();
- System.out.println("REMOTE INFORMATION FOR FIRST SELECTION");
- System.out.println("--------------------------------------");
- System.out.println("Remote object name................: " + getRemoteObjectName(obj,adapter));
- System.out.println("Remote object subsystem factory id: " + getRemoteObjectSubSystemConfigurationId(obj,adapter));
- System.out.println("Remote object type category.......: " + getRemoteObjectTypeCategory(obj,adapter));
- System.out.println("Remote object type ...............: " + getRemoteObjectType(obj,adapter));
- System.out.println("Remote object subtype ............: " + getRemoteObjectSubType(obj,adapter));
- System.out.println("Remote object subsubtype .........: " + getRemoteObjectSubSubType(obj,adapter));
+ System.out.println("REMOTE INFORMATION FOR FIRST SELECTION"); //$NON-NLS-1$
+ System.out.println("--------------------------------------"); //$NON-NLS-1$
+ System.out.println("Remote object name................: " + getRemoteObjectName(obj,adapter)); //$NON-NLS-1$
+ System.out.println("Remote object subsystem factory id: " + getRemoteObjectSubSystemConfigurationId(obj,adapter)); //$NON-NLS-1$
+ System.out.println("Remote object type category.......: " + getRemoteObjectTypeCategory(obj,adapter)); //$NON-NLS-1$
+ System.out.println("Remote object type ...............: " + getRemoteObjectType(obj,adapter)); //$NON-NLS-1$
+ System.out.println("Remote object subtype ............: " + getRemoteObjectSubType(obj,adapter)); //$NON-NLS-1$
+ System.out.println("Remote object subsubtype .........: " + getRemoteObjectSubSubType(obj,adapter)); //$NON-NLS-1$
System.out.println();
}
System.out.println();
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemBaseAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemBaseAction.java
index 07048346451..7957ccdfcca 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemBaseAction.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemBaseAction.java
@@ -574,7 +574,7 @@ public class SystemBaseAction extends Action implements ISystemAction
String label = getText();
if (label == null)
return false;
- return label.equals("dummy");
+ return label.equals("dummy"); //$NON-NLS-1$
}
/**
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemBaseCopyAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemBaseCopyAction.java
index 9cbd3de8e2f..c73b32b744e 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemBaseCopyAction.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemBaseCopyAction.java
@@ -39,11 +39,6 @@ import org.eclipse.ui.ISharedImages;
import org.eclipse.ui.PlatformUI;
-
-
-
-
-
/**
* An abstract base class for all copy actions. Defers minimal requirements to
* child classes.
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemBaseDummyAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemBaseDummyAction.java
index d5099bff64d..be36882dd9c 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemBaseDummyAction.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemBaseDummyAction.java
@@ -21,11 +21,9 @@ package org.eclipse.rse.ui.actions;
*/
public class SystemBaseDummyAction extends SystemBaseAction
{
-
-
public SystemBaseDummyAction()
{
- super("dummy", null);
+ super("dummy", null); //$NON-NLS-1$
setSelectionSensitive(false);
}
}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemCascadingRemoteServersAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemCascadingRemoteServersAction.java
index 1095a48167d..92952d6ab52 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemCascadingRemoteServersAction.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemCascadingRemoteServersAction.java
@@ -43,7 +43,7 @@ public class SystemCascadingRemoteServersAction extends SystemBaseSubMenuAction
setMenuID(ISystemContextMenuConstants.MENU_STARTSERVER);
setCreateMenuEachTime(false);
setPopulateMenuEachTime(false);
- setHelp(RSEUIPlugin.HELPPREFIX+"actnsrsv");
+ setHelp(RSEUIPlugin.HELPPREFIX+"actnsrsv"); //$NON-NLS-1$
}
/**
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemCopyConnectionAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemCopyConnectionAction.java
index 6fb1b724e6a..e078fc4a5e0 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemCopyConnectionAction.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemCopyConnectionAction.java
@@ -48,8 +48,8 @@ public class SystemCopyConnectionAction extends SystemBaseCopyAction
{
super(parent, SystemResources.ACTION_COPY_CONNECTION_LABEL, MODE_COPY);
sr = RSEUIPlugin.getTheSystemRegistry();
- setHelp(RSEUIPlugin.HELPPREFIX+"actn0019");
- setDialogHelp(RSEUIPlugin.HELPPREFIX+"dccn0000");
+ setHelp(RSEUIPlugin.HELPPREFIX+"actn0019"); //$NON-NLS-1$
+ setDialogHelp(RSEUIPlugin.HELPPREFIX+"dccn0000"); //$NON-NLS-1$
}
/**
@@ -216,7 +216,7 @@ public class SystemCopyConnectionAction extends SystemBaseCopyAction
protected SystemSimpleContentElement getProfileTreeModel(ISystemProfile profile)
{
SystemSimpleContentElement veryRootElement =
- new SystemSimpleContentElement("Profiles",
+ new SystemSimpleContentElement("Profiles", //$NON-NLS-1$
null, null, (Vector)null);
veryRootElement.setRenamable(false);
veryRootElement.setDeletable(false);
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemCopyToClipboardAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemCopyToClipboardAction.java
index 8c3b2175e61..912f7fa0400 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemCopyToClipboardAction.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemCopyToClipboardAction.java
@@ -66,7 +66,7 @@ public class SystemCopyToClipboardAction extends SystemBaseAction implements IV
allowOnMultipleSelection(true);
setContextMenuGroup(ISystemContextMenuConstants.GROUP_REORGANIZE);
- setHelp(RSEUIPlugin.HELPPREFIX+"actn0116");
+ setHelp(RSEUIPlugin.HELPPREFIX+"actn0116"); //$NON-NLS-1$
}
public void run()
@@ -82,8 +82,8 @@ public class SystemCopyToClipboardAction extends SystemBaseAction implements IV
Iterator iterator = ss.iterator();
// marshall data
- StringBuffer textStream = new StringBuffer("");
- StringBuffer dataStream = new StringBuffer("");
+ StringBuffer textStream = new StringBuffer(""); //$NON-NLS-1$
+ StringBuffer dataStream = new StringBuffer(""); //$NON-NLS-1$
ArrayList fileNames = new ArrayList();
ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry();
@@ -109,7 +109,7 @@ public class SystemCopyToClipboardAction extends SystemBaseAction implements IV
String subSystemId = registry.getAbsoluteNameForSubSystem(subSystem);
dataStream.append(subSystemId);
- dataStream.append(":");
+ dataStream.append(":"); //$NON-NLS-1$
String objectId = adapter.getAbsoluteName(dragObject);
dataStream.append(objectId);
@@ -165,7 +165,7 @@ public class SystemCopyToClipboardAction extends SystemBaseAction implements IV
* @return the string to prepend for the selected object.
*/
protected String getTextTransferPrepend(Object obj, ISystemViewElementAdapter adapter) {
- return "";
+ return ""; //$NON-NLS-1$
}
/**
@@ -176,7 +176,7 @@ public class SystemCopyToClipboardAction extends SystemBaseAction implements IV
* @return the string to append for the selected object.
*/
protected String getTextTransferAppend(Object obj, ISystemViewElementAdapter adapter) {
- return System.getProperty("line.separator");
+ return System.getProperty("line.separator"); //$NON-NLS-1$
}
/**
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemMoveConnectionAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemMoveConnectionAction.java
index 28f3ec5a5ce..ae37e5c0f1a 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemMoveConnectionAction.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemMoveConnectionAction.java
@@ -51,8 +51,8 @@ public class SystemMoveConnectionAction extends SystemBaseCopyAction
super(parent, SystemResources.ACTION_MOVE_CONNECTION_LABEL, MODE_MOVE);
//allowOnMultipleSelection(false); // too hard to handle, for now!
sr = RSEUIPlugin.getTheSystemRegistry();
- setHelp(RSEUIPlugin.HELPPREFIX+"actn0020");
- setDialogHelp(RSEUIPlugin.HELPPREFIX+"dmcn0000");
+ setHelp(RSEUIPlugin.HELPPREFIX+"actn0020"); //$NON-NLS-1$
+ setDialogHelp(RSEUIPlugin.HELPPREFIX+"dmcn0000"); //$NON-NLS-1$
}
/**
@@ -220,7 +220,7 @@ public class SystemMoveConnectionAction extends SystemBaseCopyAction
protected SystemSimpleContentElement getProfileTreeModel(ISystemProfile profile)
{
SystemSimpleContentElement veryRootElement =
- new SystemSimpleContentElement("Profiles",
+ new SystemSimpleContentElement("Profiles", //$NON-NLS-1$
null, null, (Vector)null);
veryRootElement.setRenamable(false);
veryRootElement.setDeletable(false);
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemMoveDownConnectionAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemMoveDownConnectionAction.java
index ac72d8e87fb..7b3cd60546a 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemMoveDownConnectionAction.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemMoveDownConnectionAction.java
@@ -48,7 +48,7 @@ public class SystemMoveDownConnectionAction extends SystemBaseAction
parent);
allowOnMultipleSelection(true);
setContextMenuGroup(ISystemContextMenuConstants.GROUP_REORDER);
- setHelp(RSEUIPlugin.HELPPREFIX+"actn0002");
+ setHelp(RSEUIPlugin.HELPPREFIX+"actn0002"); //$NON-NLS-1$
}
/**
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemMoveUpConnectionAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemMoveUpConnectionAction.java
index e027456fa71..56a4e12954b 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemMoveUpConnectionAction.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemMoveUpConnectionAction.java
@@ -48,7 +48,7 @@ public class SystemMoveUpConnectionAction extends SystemBaseAction
parent);
allowOnMultipleSelection(true);
setContextMenuGroup(ISystemContextMenuConstants.GROUP_REORDER);
- setHelp(RSEUIPlugin.HELPPREFIX+"actn0001");
+ setHelp(RSEUIPlugin.HELPPREFIX+"actn0001"); //$NON-NLS-1$
}
/**
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemNewConnectionAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemNewConnectionAction.java
index be703c84a06..44779cf4115 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemNewConnectionAction.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemNewConnectionAction.java
@@ -93,7 +93,7 @@ public class SystemNewConnectionAction extends SystemBaseWizardAction
setContextMenuGroup(ISystemContextMenuConstants.GROUP_NEW);
this.fromPopupMenu = fromPopupMenu;
this.sp = sp;
- setHelp(RSEUIPlugin.HELPPREFIX+"actn0000");
+ setHelp(RSEUIPlugin.HELPPREFIX+"actn0000"); //$NON-NLS-1$
}
/**
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemNewProfileAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemNewProfileAction.java
index 1344d20fe14..1eef76c0246 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemNewProfileAction.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemNewProfileAction.java
@@ -42,7 +42,7 @@ public class SystemNewProfileAction extends SystemBaseWizardAction
super(SystemResources.ACTION_NEWPROFILE_LABEL, SystemResources.ACTION_NEWPROFILE_TOOLTIP, RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_NEWPROFILE_ID), parent);
setSelectionSensitive(false);
setContextMenuGroup(ISystemContextMenuConstants.GROUP_NEW);
- setHelp(RSEUIPlugin.HELPPREFIX+"actn0003");
+ setHelp(RSEUIPlugin.HELPPREFIX+"actn0003"); //$NON-NLS-1$
}
/**
* Constructor for SystemNewProfileAction where you can choose between "New profile..." and "New -> Profile"
@@ -57,7 +57,7 @@ public class SystemNewProfileAction extends SystemBaseWizardAction
setContextMenuGroup(ISystemContextMenuConstants.GROUP_NEW);
else
setContextMenuGroup(ISystemContextMenuConstants.GROUP_NEW_NONCASCADING);
- setHelp(RSEUIPlugin.HELPPREFIX+"actn0003");
+ setHelp(RSEUIPlugin.HELPPREFIX+"actn0003"); //$NON-NLS-1$
}
/**
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemPasteFromClipboardAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemPasteFromClipboardAction.java
index 505c9821edf..883e053d2df 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemPasteFromClipboardAction.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemPasteFromClipboardAction.java
@@ -72,7 +72,7 @@ public class SystemPasteFromClipboardAction extends SystemBaseAction implements
allowOnMultipleSelection(false);
setContextMenuGroup(ISystemContextMenuConstants.GROUP_REORGANIZE);
- setHelp(RSEUIPlugin.HELPPREFIX + "actn0117");
+ setHelp(RSEUIPlugin.HELPPREFIX + "actn0117"); //$NON-NLS-1$
}
public void run()
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemPreferenceQualifyConnectionNamesAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemPreferenceQualifyConnectionNamesAction.java
index 51ed262ec47..9f607597177 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemPreferenceQualifyConnectionNamesAction.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemPreferenceQualifyConnectionNamesAction.java
@@ -15,8 +15,8 @@
********************************************************************************/
package org.eclipse.rse.ui.actions;
+import org.eclipse.rse.core.model.ISystemPreferenceChangeEvents;
import org.eclipse.rse.internal.model.SystemPreferenceChangeEvent;
-import org.eclipse.rse.model.ISystemPreferenceChangeEvents;
import org.eclipse.rse.model.ISystemRegistry;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.SystemResources;
@@ -44,7 +44,7 @@ public class SystemPreferenceQualifyConnectionNamesAction extends SystemBaseActi
sr = RSEUIPlugin.getTheSystemRegistry();
setChecked(sr.getQualifiedHostNames());
- setHelp(RSEUIPlugin.HELPPREFIX+"actn0008");
+ setHelp(RSEUIPlugin.HELPPREFIX+"actn0008"); //$NON-NLS-1$
}
/**
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemPreferenceRestoreStateAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemPreferenceRestoreStateAction.java
index 18aae26dba1..273b65d4937 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemPreferenceRestoreStateAction.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemPreferenceRestoreStateAction.java
@@ -16,8 +16,8 @@
package org.eclipse.rse.ui.actions;
import org.eclipse.rse.core.SystemPreferencesManager;
+import org.eclipse.rse.core.model.ISystemPreferenceChangeEvents;
import org.eclipse.rse.internal.model.SystemPreferenceChangeEvent;
-import org.eclipse.rse.model.ISystemPreferenceChangeEvents;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.SystemResources;
import org.eclipse.swt.widgets.Shell;
@@ -42,7 +42,7 @@ public class SystemPreferenceRestoreStateAction extends SystemBaseAction
//sr = RSEUIPlugin.getTheSystemRegistry();
setChecked(SystemPreferencesManager.getPreferencesManager().getRememberState());
- setHelp(RSEUIPlugin.HELPPREFIX+"aprefres");
+ setHelp(RSEUIPlugin.HELPPREFIX+"aprefres"); //$NON-NLS-1$
}
/**
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemPreferenceShowFilterPoolsAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemPreferenceShowFilterPoolsAction.java
index 646feff6b7a..a693eac8ff5 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemPreferenceShowFilterPoolsAction.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemPreferenceShowFilterPoolsAction.java
@@ -16,8 +16,8 @@
package org.eclipse.rse.ui.actions;
import org.eclipse.rse.core.SystemPreferencesManager;
+import org.eclipse.rse.core.model.ISystemPreferenceChangeEvents;
import org.eclipse.rse.internal.model.SystemPreferenceChangeEvent;
-import org.eclipse.rse.model.ISystemPreferenceChangeEvents;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.SystemResources;
import org.eclipse.swt.widgets.Shell;
@@ -43,7 +43,7 @@ public class SystemPreferenceShowFilterPoolsAction extends SystemBaseAction
setChecked(SystemPreferencesManager.getPreferencesManager().getShowFilterPools());
setSelectionSensitive(false);
- setHelp(RSEUIPlugin.HELPPREFIX+"actn0011");
+ setHelp(RSEUIPlugin.HELPPREFIX+"actn0011"); //$NON-NLS-1$
}
/**
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemProfileNameCopyAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemProfileNameCopyAction.java
index fbcc4d6e739..50247840168 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemProfileNameCopyAction.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemProfileNameCopyAction.java
@@ -35,10 +35,6 @@ import org.eclipse.ui.ISharedImages;
import org.eclipse.ui.PlatformUI;
-
-
-
-
/**
* A copy profile action. Will copy the profile, and all connections for the profile.
* We must first prompt user for a new name for the copied profile.
@@ -65,7 +61,7 @@ public class SystemProfileNameCopyAction extends SystemBaseDialogAction
sr = RSEUIPlugin.getTheSystemRegistry();
setSelectionSensitive(true);
allowOnMultipleSelection(false);
- setHelp(RSEUIPlugin.HELPPREFIX+"actndupr");
+ setHelp(RSEUIPlugin.HELPPREFIX+"actndupr"); //$NON-NLS-1$
}
/**
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemProfileNameSelectAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemProfileNameSelectAction.java
index fb06777741a..2813a6ddd11 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemProfileNameSelectAction.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemProfileNameSelectAction.java
@@ -27,9 +27,7 @@ import org.eclipse.swt.widgets.Shell;
* A selectable profile name action.
*/
public class SystemProfileNameSelectAction extends SystemBaseAction
-
{
-
private ISystemProfile profile;
/**
@@ -43,7 +41,7 @@ public class SystemProfileNameSelectAction extends SystemBaseAction
setChecked(mgr.isSystemProfileActive(profile.getName()));
setSelectionSensitive(false);
- setHelp(RSEUIPlugin.HELPPREFIX+"actn0004");
+ setHelp(RSEUIPlugin.HELPPREFIX+"actn0004"); //$NON-NLS-1$
}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemRefreshAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemRefreshAction.java
index 02725a191e6..758346628c1 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemRefreshAction.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemRefreshAction.java
@@ -18,7 +18,7 @@ package org.eclipse.rse.ui.actions;
import java.util.Iterator;
import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.rse.model.ISystemContainer;
+import org.eclipse.rse.core.model.ISystemContainer;
import org.eclipse.rse.model.ISystemRegistry;
import org.eclipse.rse.model.ISystemResourceChangeEvents;
import org.eclipse.rse.model.ISystemResourceChangeListener;
@@ -48,7 +48,7 @@ public class SystemRefreshAction extends SystemBaseAction
parent);
allowOnMultipleSelection(true);
setContextMenuGroup(ISystemContextMenuConstants.GROUP_BUILD);
- setHelp(RSEUIPlugin.HELPPREFIX+"actn0017");
+ setHelp(RSEUIPlugin.HELPPREFIX+"actn0017"); //$NON-NLS-1$
setAvailableOffline(true);
}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemRefreshAllAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemRefreshAllAction.java
index 915c28814e0..f8461fb4441 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemRefreshAllAction.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemRefreshAllAction.java
@@ -18,7 +18,7 @@ package org.eclipse.rse.ui.actions;
import java.util.Iterator;
import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.rse.model.ISystemContainer;
+import org.eclipse.rse.core.model.ISystemContainer;
import org.eclipse.rse.model.ISystemRegistry;
import org.eclipse.rse.model.ISystemResourceChangeEvents;
import org.eclipse.rse.model.SystemResourceChangeEvent;
@@ -51,7 +51,7 @@ public class SystemRefreshAllAction extends SystemBaseAction
//setSelectionSensitive(false);
setSelectionSensitive(true);// use selection to decide what to invalidate
- setHelp(RSEUIPlugin.HELPPREFIX+"actn0009");
+ setHelp(RSEUIPlugin.HELPPREFIX+"actn0009"); //$NON-NLS-1$
}
public void setRootObject(Object object)
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemWorkOfflineAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemWorkOfflineAction.java
index e6e1851c68b..eff259252cb 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemWorkOfflineAction.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemWorkOfflineAction.java
@@ -45,7 +45,7 @@ public class SystemWorkOfflineAction extends SystemBaseAction
super(SystemResources.RESID_OFFLINE_WORKOFFLINE_LABEL, SystemResources.RESID_OFFLINE_WORKOFFLINE_TOOLTIP, shell);
allowOnMultipleSelection(false);
setContextMenuGroup(ISystemContextMenuConstants.GROUP_CONNECTION);
- setHelp(RSEUIPlugin.HELPPREFIX+"wofa0000");
+ setHelp(RSEUIPlugin.HELPPREFIX+"wofa0000"); //$NON-NLS-1$
}
/**
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemCopyProfileDialog.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemCopyProfileDialog.java
index c8eb5850780..7147e8102c3 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemCopyProfileDialog.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemCopyProfileDialog.java
@@ -72,7 +72,7 @@ public class SystemCopyProfileDialog extends SystemPromptDialog
}
nameValidator = RSEUIPlugin.getTheSystemRegistry().getSystemProfileManager().getProfileNameValidator((String)null);
//pack();
- setHelp(RSEUIPlugin.HELPPREFIX+"drnp0000");
+ setHelp(RSEUIPlugin.HELPPREFIX+"drnp0000"); //$NON-NLS-1$
}
/**
* Create message line. Intercept so we can set msg line of form.
@@ -120,9 +120,9 @@ public class SystemCopyProfileDialog extends SystemPromptDialog
// SET HELP CONTEXT IDS...
//SystemWidgetHelpers.setHelp(newName, RSEUIPlugin.HELPPREFIX+"drnp0002", RSEUIPlugin.HELPPREFIX+"drnp0000");
- SystemWidgetHelpers.setHelp(newName, RSEUIPlugin.HELPPREFIX+"drnp0002");
+ SystemWidgetHelpers.setHelp(newName, RSEUIPlugin.HELPPREFIX+"drnp0002"); //$NON-NLS-1$
//SystemWidgetHelpers.setHelp(makeActiveCB, RSEUIPlugin.HELPPREFIX+"drnp0003", RSEUIPlugin.HELPPREFIX+"drnp0000");
- SystemWidgetHelpers.setHelp(makeActiveCB, RSEUIPlugin.HELPPREFIX+"drnp0003");
+ SystemWidgetHelpers.setHelp(makeActiveCB, RSEUIPlugin.HELPPREFIX+"drnp0003"); //$NON-NLS-1$
initialize();
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRenameDialog.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRenameDialog.java
index e842d127edf..a480bebf2be 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRenameDialog.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRenameDialog.java
@@ -106,7 +106,7 @@ public class SystemRenameDialog extends SystemPromptDialog
private TableViewer tableViewer;
private static final int COLUMN_NEWNAME = SystemRenameTableProvider.COLUMN_NEWNAME;
private String columnHeaders[] = {
- "",SystemResources.RESID_RENAME_COLHDG_OLDNAME,
+ "",SystemResources.RESID_RENAME_COLHDG_OLDNAME, //$NON-NLS-1$
SystemResources.RESID_RENAME_COLHDG_NEWNAME,
SystemResources.RESID_RENAME_COLHDG_TYPE
};
@@ -131,7 +131,7 @@ public class SystemRenameDialog extends SystemPromptDialog
public Object getValue(Object element, String property)
{
SystemRenameTableRow row = (SystemRenameTableRow)element;
- String value = "";
+ String value = ""; //$NON-NLS-1$
if (property.equals(P_TEXT))
value = row.getName();
else
@@ -184,7 +184,7 @@ public class SystemRenameDialog extends SystemPromptDialog
super(shell, title);
//pack();
- setHelp(RSEUIPlugin.HELPPREFIX+"drnm0000");
+ setHelp(RSEUIPlugin.HELPPREFIX+"drnm0000"); //$NON-NLS-1$
}
/**
* Set the verbage to show above the table. The default is "Enter new name for each resource"
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRenameSingleDialog.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRenameSingleDialog.java
index 868b58dc59d..5b791434816 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRenameSingleDialog.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRenameSingleDialog.java
@@ -88,7 +88,7 @@ public class SystemRenameSingleDialog extends SystemPromptDialog
private Text newName;
private String promptLabel, promptTip;
private String newNameString;
- private String inputName = "";
+ private String inputName = ""; //$NON-NLS-1$
private Label resourceTypePrompt, resourceTypeValue, verbageLabel, renameLabel;
private SystemMessage errorMessage;
private ISystemValidator nameValidator;
@@ -119,7 +119,7 @@ public class SystemRenameSingleDialog extends SystemPromptDialog
//pack();
setBlockOnOpen(true);
- setHelp(RSEUIPlugin.HELPPREFIX+"drns0000");
+ setHelp(RSEUIPlugin.HELPPREFIX+"drns0000"); //$NON-NLS-1$
}
/**
@@ -158,17 +158,17 @@ public class SystemRenameSingleDialog extends SystemPromptDialog
{
if (this.inputObject != null && this.inputObject instanceof IHost)
{
- setHelp(RSEUIPlugin.HELPPREFIX+"dccc0000");
+ setHelp(RSEUIPlugin.HELPPREFIX+"dccc0000"); //$NON-NLS-1$
}
else
{
- setHelp(RSEUIPlugin.HELPPREFIX+"drns0001");
+ setHelp(RSEUIPlugin.HELPPREFIX+"drns0001"); //$NON-NLS-1$
}
setTitle(SystemResources.RESID_COLLISION_RENAME_TITLE);
}
else if (this.copyCollisionMode) // from true to false
{
- setHelp(RSEUIPlugin.HELPPREFIX+"drns0000");
+ setHelp(RSEUIPlugin.HELPPREFIX+"drns0000"); //$NON-NLS-1$
String singleTitle = SystemResources.RESID_RENAME_SINGLE_TITLE;
if (!singleTitle.startsWith("Missing")) // TODO: remove test after next mri rev
setTitle(singleTitle);
@@ -230,14 +230,14 @@ public class SystemRenameSingleDialog extends SystemPromptDialog
if (copyCollisionMode)
{
// VERBAGE
- verbageLabel = SystemWidgetHelpers.createLabel(composite, " ", nbrColumns);
- SystemWidgetHelpers.createLabel(composite, " ", nbrColumns); //filler
+ verbageLabel = SystemWidgetHelpers.createLabel(composite, " ", nbrColumns); //$NON-NLS-1$
+ SystemWidgetHelpers.createLabel(composite, " ", nbrColumns); //filler //$NON-NLS-1$
}
else if (description != null)
{
// VERBAGE
verbageLabel = SystemWidgetHelpers.createLabel(composite, description, nbrColumns);
- SystemWidgetHelpers.createLabel(composite, " ", nbrColumns); //filler
+ SystemWidgetHelpers.createLabel(composite, " ", nbrColumns); //filler //$NON-NLS-1$
}
if (copyCollisionMode)
@@ -254,7 +254,7 @@ public class SystemRenameSingleDialog extends SystemPromptDialog
// RESOURCE TYPE
resourceTypePrompt = SystemWidgetHelpers.createLabel(
renameGroup, SystemResources.RESID_SIMPLE_RENAME_RESOURCEPROMPT_LABEL);
- resourceTypeValue = SystemWidgetHelpers.createLabel(renameGroup, "");
+ resourceTypeValue = SystemWidgetHelpers.createLabel(renameGroup, ""); //$NON-NLS-1$
resourceTypeValue.setToolTipText(SystemResources.RESID_SIMPLE_RENAME_RESOURCEPROMPT_TOOLTIP);
@@ -510,7 +510,7 @@ public class SystemRenameSingleDialog extends SystemPromptDialog
*/
public static String trimTrailing(String text)
{
- return ("."+text).trim().substring(1);
+ return ("."+text).trim().substring(1); //$NON-NLS-1$
}
/**
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemUpdateConnectionDialog.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemUpdateConnectionDialog.java
index 3a09b0b4731..4c587128356 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemUpdateConnectionDialog.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemUpdateConnectionDialog.java
@@ -44,7 +44,7 @@ public class SystemUpdateConnectionDialog extends SystemPromptDialog implements
public SystemUpdateConnectionDialog(Shell shell)
{
super(shell, SystemResources.RESID_CHGCONN_TITLE);
- parentHelpId = RSEUIPlugin.HELPPREFIX + "dcon0000";
+ parentHelpId = RSEUIPlugin.HELPPREFIX + "dcon0000"; //$NON-NLS-1$
getForm();
//pack();
}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/RemoteSystemsPreferencePage.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/RemoteSystemsPreferencePage.java
index 2c5134327cf..5ed89d7e600 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/RemoteSystemsPreferencePage.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/RemoteSystemsPreferencePage.java
@@ -24,9 +24,9 @@ import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.util.PropertyChangeEvent;
import org.eclipse.rse.core.IRSESystemType;
import org.eclipse.rse.core.RSECorePlugin;
+import org.eclipse.rse.core.model.ISystemPreferenceChangeEvents;
import org.eclipse.rse.internal.model.SystemPreferenceChangeEvent;
import org.eclipse.rse.internal.model.SystemProfileManager;
-import org.eclipse.rse.model.ISystemPreferenceChangeEvents;
import org.eclipse.rse.ui.ISystemPreferencesConstants;
import org.eclipse.rse.ui.Mnemonics;
import org.eclipse.rse.ui.RSESystemTypeAdapter;
@@ -189,7 +189,7 @@ public class RemoteSystemsPreferencePage
(new Mnemonics()).setOnPreferencePage(true).setMnemonics(getFieldEditorParent());
// set help
- SystemWidgetHelpers.setCompositeHelp(getFieldEditorParent(), RSEUIPlugin.HELPPREFIX+"rsep0000");
+ SystemWidgetHelpers.setCompositeHelp(getFieldEditorParent(), RSEUIPlugin.HELPPREFIX+"rsep0000"); //$NON-NLS-1$
}
// ---------------------------------------------------------
@@ -392,7 +392,7 @@ public class RemoteSystemsPreferencePage
defaultUserId = "null";
}
- keyValues.put(sysType.getName(), "" + sysTypeAdapter.isEnabled(sysType) + SystemTypeFieldEditor.EACHVALUE_DELIMITER + defaultUserId);
+ keyValues.put(sysType.getName(), "" + sysTypeAdapter.isEnabled(sysType) + SystemTypeFieldEditor.EACHVALUE_DELIMITER + defaultUserId); //$NON-NLS-1$
String s = SystemTypeFieldEditor.createString(keyValues);
if (s != null)
@@ -482,7 +482,7 @@ public class RemoteSystemsPreferencePage
*/
protected static Hashtable parseString(String allvalues)
{
- StringTokenizer tokens = new StringTokenizer(allvalues, "=;");
+ StringTokenizer tokens = new StringTokenizer(allvalues, "=;"); //$NON-NLS-1$
Hashtable keyValues = new Hashtable(10);
int count = 0;
String token1=null;
@@ -530,7 +530,7 @@ public class RemoteSystemsPreferencePage
if (allvalues == null)
return new String[0];
//StringTokenizer tokens = new StringTokenizer(allvalues, ";");
- String[] tokens = allvalues.split(";");
+ String[] tokens = allvalues.split(";"); //$NON-NLS-1$
return tokens;
/*
Vector v = new Vector();
@@ -590,7 +590,7 @@ public class RemoteSystemsPreferencePage
String defaultProfileNames = ISystemPreferencesConstants.DEFAULT_ACTIVEUSERPROFILES;
String userProfileName = SystemProfileManager.getDefaultPrivateSystemProfileName();
- defaultProfileNames += ";" + userProfileName;
+ defaultProfileNames += ";" + userProfileName; //$NON-NLS-1$
store.setDefault(ISystemPreferencesConstants.ACTIVEUSERPROFILES, defaultProfileNames);
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SignonPreferencePage.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SignonPreferencePage.java
index ed20ffb2a0e..c158a59c905 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SignonPreferencePage.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SignonPreferencePage.java
@@ -191,7 +191,7 @@ public final class SignonPreferencePage extends PreferencePage implements IWorkb
pwdTable.setLinesVisible(true);
pwdTable.setHeaderVisible(true);
pwdTable.addListener(SWT.Selection, this);
- SystemWidgetHelpers.setHelp(pwdTable, RSEUIPlugin.HELPPREFIX + "pwdi0000");
+ SystemWidgetHelpers.setHelp(pwdTable, RSEUIPlugin.HELPPREFIX + "pwdi0000"); //$NON-NLS-1$
TableLayout tableLayout = new TableLayout();
tableLayout.addColumnData(new ColumnWeightData(100, true));
@@ -235,11 +235,11 @@ public final class SignonPreferencePage extends PreferencePage implements IWorkb
changeButton.setEnabled(false);
removeButton.setEnabled(false);
- SystemWidgetHelpers.setHelp(addButton, RSEUIPlugin.HELPPREFIX + "pwdi0000");
- SystemWidgetHelpers.setHelp(changeButton, RSEUIPlugin.HELPPREFIX + "pwdi0000");
- SystemWidgetHelpers.setHelp(removeButton, RSEUIPlugin.HELPPREFIX + "pwdi0000");
+ SystemWidgetHelpers.setHelp(addButton, RSEUIPlugin.HELPPREFIX + "pwdi0000"); //$NON-NLS-1$
+ SystemWidgetHelpers.setHelp(changeButton, RSEUIPlugin.HELPPREFIX + "pwdi0000"); //$NON-NLS-1$
+ SystemWidgetHelpers.setHelp(removeButton, RSEUIPlugin.HELPPREFIX + "pwdi0000"); //$NON-NLS-1$
- SystemWidgetHelpers.setCompositeHelp(parent, RSEUIPlugin.HELPPREFIX + "pwdi0000");
+ SystemWidgetHelpers.setCompositeHelp(parent, RSEUIPlugin.HELPPREFIX + "pwdi0000"); //$NON-NLS-1$
SystemWidgetHelpers.setMnemonics(parent);
return parent;
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemAbstractPropertyPageExtensionAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemAbstractPropertyPageExtensionAction.java
index 07f415d6da7..8cccc141fbf 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemAbstractPropertyPageExtensionAction.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemAbstractPropertyPageExtensionAction.java
@@ -214,22 +214,22 @@ public abstract class SystemAbstractPropertyPageExtensionAction
//System.out.println("Remote object subtype ............: " + getRemoteObjectSubType());
//System.out.println("Remote object subsubtype .........: " + getRemoteObjectSubSubType());
- SystemWidgetHelpers.createLabel(composite_prompts, "Remote object name: ");
+ SystemWidgetHelpers.createLabel(composite_prompts, "Remote object name: "); //$NON-NLS-1$
SystemWidgetHelpers.createLabel(composite_prompts, checkForNull(getRemoteObjectName()));
- SystemWidgetHelpers.createLabel(composite_prompts, "Remote object subsystem factory id: ");
+ SystemWidgetHelpers.createLabel(composite_prompts, "Remote object subsystem factory id: "); //$NON-NLS-1$
SystemWidgetHelpers.createLabel(composite_prompts, checkForNull(getRemoteObjectSubSystemConfigurationId()));
- SystemWidgetHelpers.createLabel(composite_prompts, "Remote object type category: ");
+ SystemWidgetHelpers.createLabel(composite_prompts, "Remote object type category: "); //$NON-NLS-1$
SystemWidgetHelpers.createLabel(composite_prompts, checkForNull(getRemoteObjectTypeCategory()));
- SystemWidgetHelpers.createLabel(composite_prompts, "Remote object type: ");
+ SystemWidgetHelpers.createLabel(composite_prompts, "Remote object type: "); //$NON-NLS-1$
SystemWidgetHelpers.createLabel(composite_prompts, checkForNull(getRemoteObjectType()));
- SystemWidgetHelpers.createLabel(composite_prompts, "Remote object subtype: ");
+ SystemWidgetHelpers.createLabel(composite_prompts, "Remote object subtype: "); //$NON-NLS-1$
SystemWidgetHelpers.createLabel(composite_prompts, checkForNull(getRemoteObjectSubType()));
- SystemWidgetHelpers.createLabel(composite_prompts, "Remote object subsubtype: ");
+ SystemWidgetHelpers.createLabel(composite_prompts, "Remote object subsubtype: "); //$NON-NLS-1$
SystemWidgetHelpers.createLabel(composite_prompts, checkForNull(getRemoteObjectSubSubType()));
return composite_prompts;
@@ -241,7 +241,7 @@ public abstract class SystemAbstractPropertyPageExtensionAction
private String checkForNull(String input)
{
if (input == null)
- return "";
+ return ""; //$NON-NLS-1$
else
return input;
}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemConnectionPropertyPage.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemConnectionPropertyPage.java
index 8acb1cd0740..1c69f19402e 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemConnectionPropertyPage.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemConnectionPropertyPage.java
@@ -49,7 +49,7 @@ public class SystemConnectionPropertyPage extends SystemBasePropertyPage
super();
RSEUIPlugin sp = RSEUIPlugin.getDefault();
- parentHelpId = RSEUIPlugin.HELPPREFIX + "pcon0000";
+ parentHelpId = RSEUIPlugin.HELPPREFIX + "pcon0000"; //$NON-NLS-1$
form = new SystemConnectionForm(this, this);
}
/**
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemConnectionSubSystemsPropertyPage.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemConnectionSubSystemsPropertyPage.java
index fe0f702424e..f399ce0b5df 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemConnectionSubSystemsPropertyPage.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemConnectionSubSystemsPropertyPage.java
@@ -72,7 +72,7 @@ public class SystemConnectionSubSystemsPropertyPage extends SystemBasePropertyPa
{
super();
//RSEUIPlugin sp = RSEUIPlugin.getDefault();
- parentHelpId = RSEUIPlugin.HELPPREFIX + "pcon0000";
+ parentHelpId = RSEUIPlugin.HELPPREFIX + "pcon0000"; //$NON-NLS-1$
}
/**
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.java
index 4bc69ab8811..1532fa97e5f 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.java
@@ -30,17 +30,17 @@ import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.rse.core.SystemAdapterHelpers;
import org.eclipse.rse.core.SystemBasePlugin;
+import org.eclipse.rse.core.model.ISystemMessageObject;
+import org.eclipse.rse.core.model.ISystemResourceSet;
+import org.eclipse.rse.core.model.SystemMessageObject;
+import org.eclipse.rse.core.model.SystemWorkspaceResourceSet;
import org.eclipse.rse.core.subsystems.AbstractResource;
import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
import org.eclipse.rse.core.subsystems.util.ISubSystemConfigurationAdapter;
import org.eclipse.rse.model.IHost;
-import org.eclipse.rse.model.ISystemMessageObject;
import org.eclipse.rse.model.ISystemPromptableObject;
-import org.eclipse.rse.model.ISystemResourceSet;
-import org.eclipse.rse.model.SystemMessageObject;
import org.eclipse.rse.model.SystemRemoteResourceSet;
-import org.eclipse.rse.model.SystemWorkspaceResourceSet;
import org.eclipse.rse.ui.ISystemMessages;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.SystemMenuManager;
@@ -123,15 +123,15 @@ public abstract class AbstractSystemViewAdapter
/**
* Message substitution prefix: "&"
*/
- protected static final String MSG_SUB_PREFIX = "&";
+ protected static final String MSG_SUB_PREFIX = "&"; //$NON-NLS-1$
/**
* Message substitution variable 1: "&1"
*/
- protected static final String MSG_SUB1 = MSG_SUB_PREFIX+"1";
+ protected static final String MSG_SUB1 = MSG_SUB_PREFIX+"1"; //$NON-NLS-1$
/**
* Message substitution variable 2: "&2"
*/
- protected static final String MSG_SUB2 = MSG_SUB_PREFIX+"2";
+ protected static final String MSG_SUB2 = MSG_SUB_PREFIX+"2"; //$NON-NLS-1$
/**
* Delimiter for each object's key in a memento, used to persist tree view expansion state: "///"
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/ISystemDragDropAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/ISystemDragDropAdapter.java
index 28654fee896..2cee8a87b12 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/ISystemDragDropAdapter.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/ISystemDragDropAdapter.java
@@ -17,9 +17,9 @@
package org.eclipse.rse.ui.view;
import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.rse.core.model.ISystemResourceSet;
import org.eclipse.rse.core.subsystems.IRemoteObjectIdentifier;
import org.eclipse.rse.core.subsystems.ISubSystem;
-import org.eclipse.rse.model.ISystemResourceSet;
import org.eclipse.rse.model.SystemRemoteResourceSet;
public interface ISystemDragDropAdapter extends IRemoteObjectIdentifier
@@ -77,7 +77,7 @@ public interface ISystemDragDropAdapter extends IRemoteObjectIdentifier
/**
* Perform drop from the "fromSet" of objects to the "to" object
- * @param from the source objects for the drop
+ * @param fromSet the source objects for the drop
* @param to the target object for the drop
* @param sameSystemType indication of whether the source and target reside of the same type of system
* @param sameSystem indication of whether the source and target are on the same system
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SubSystemConfigurationAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SubSystemConfigurationAdapter.java
index 92fcbe49228..a3e32d77d63 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SubSystemConfigurationAdapter.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SubSystemConfigurationAdapter.java
@@ -24,6 +24,7 @@ import java.util.Vector;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IExtensionRegistry;
import org.eclipse.core.runtime.Platform;
+import org.eclipse.debug.internal.ui.launchConfigurations.OrganizeFavoritesAction;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.IStructuredSelection;
@@ -175,7 +176,7 @@ public class SubSystemConfigurationAdapter implements ISubSystemConfigurationAda
*
* @param filterString filter pattern for objects to return.
- * @param Shell parent shell used to show error message. Null means you will handle showing the error message.
+ * @param shell parent shell used to show error message. Null means you will handle showing the error message.
*/
public Object[] resolveFilterString(String filterString, Shell shell)
throws Exception
@@ -2030,7 +2030,7 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
* returning them.
*
* @param filterStrings array of filter patterns for objects to return.
- * @param Shell parent shell used to show error message. Null means you will handle showing the error message.
+ * @param shell parent shell used to show error message. Null means you will handle showing the error message.
* @return Array of objects that are the result of resolving all the filter strings
*/
public Object[] resolveFilterStrings(String[] filterStrings, Shell shell)
@@ -2288,7 +2288,7 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
*
* @param parent Object that is being expanded.
* @param filterString filter pattern for children of parent. Typically just "*".
- * @param Shell parent shell used to show error message. Null means you will handle showing the error message.
+ * @param shell parent shell used to show error message. Null means you will handle showing the error message.
*/
public Object[] resolveFilterString(Object parent, String filterString, Shell shell)
throws Exception
@@ -2345,7 +2345,7 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
* @param subject Identifies which object to get the properties of
* @param key Identifies property to set
* @param value Value to set property to
- * @param Shell parent shell used to show error message. Null means you will handle showing the error message.
+ * @param shell parent shell used to show error message. Null means you will handle showing the error message.
* @return Object interpretable by subsystem. Might be a Boolean, or the might be new value for confirmation.
*/
public Object setProperty(Object subject, String key, String value, Shell shell)
@@ -2384,7 +2384,7 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
* true for supportsProperties().
* @param subject Identifies which object to get the properties of
* @param key Identifies property to get value of
- * @param Shell parent shell used to show error message. Null means you will handle showing the error message.
+ * @param shell parent shell used to show error message. Null means you will handle showing the error message.
* @return String The value of the requested key.
*/
public String getProperty(Object subject, String key, Shell shell)
@@ -2423,9 +2423,9 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
* a number of remote environment variables. This is only applicable if the subsystem factory reports
* true for supportsProperties().
* @param subject Identifies which object to get the properties of
- * @param key Identifies property to set
- * @param value Values to set properties to. One to one mapping to keys by index number
- * @param Shell parent shell used to show error message. Null means you will handle showing the error message.
+ * @param keys Identifies properties to set
+ * @param values Values to set properties to. One to one mapping to keys by index number
+ * @param shell parent shell used to show error message. Null means you will handle showing the error message.
* @return Object interpretable by subsystem. Might be a Boolean, or the might be new values for confirmation.
*/
public Object setProperties(Object subject, String[] keys, String[] values, Shell shell)
@@ -2472,7 +2472,7 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
*
* Override internalConnect if you want, but by default it calls getSystem().connect(IProgressMonitor).
*
- * @param Shell parent shell used to show error message. Null means you will handle showing the error message.
+ * @param shell parent shell used to show error message. Null means you will handle showing the error message.
*/
public void connect(Shell shell) throws Exception
{
@@ -2512,7 +2512,7 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
*
* Override internalConnect if you want, but by default it calls getSystem().connect(IProgressMonitor).
*
- * @param Shell parent shell used to show error message. Null means you will handle showing the error message.
+ * @param shell parent shell used to show error message. Null means you will handle showing the error message.
* @param forcePrompt Forces the signon prompt to be displayed even if a valid password in cached in memory
* or saved on disk.
*/
@@ -2556,7 +2556,7 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
/**
* A convenience method, fully equivalent to promptForPassword(shell, false).
- * @param Shell parent shell used to show any error messages.
+ * @param shell parent shell used to show any error messages.
*/
public boolean promptForPassword(Shell shell) throws Exception
{
@@ -2568,7 +2568,7 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
* but we have detected the user is not connected so we prompt for password outside
* of the progress monitor, then set a flag to do the connection within the progress
* monitor.
- * @param Shell parent shell used to show error messages.
+ * @param shell parent shell used to show error messages.
* @param force true if the prompting should be forced, false if prompting can be skipped if credentials have been stored.
* @return true if the credentials are obtained
*/
@@ -2614,7 +2614,7 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
*
* Override internalDisconnect if you want, but by default it calls getSystem().disconnect(IProgressMonitor).
*
- * @param Shell parent shell used to show error message. Null means you will handle showing the error message.
+ * @param shell parent shell used to show error message. Null means you will handle showing the error message.
*/
public void disconnect(Shell shell) throws Exception
{
@@ -2628,7 +2628,7 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
*
* Override internalDisconnect if you want, but by default it calls getSystem().disconnect(IProgressMonitor).
*
- * @param Shell parent shell used to show error message. Null means you will handle showing the error message.
+ * @param shell parent shell used to show error message. Null means you will handle showing the error message.
* @param collapseTree collapse the tree in the system view
*/
public void disconnect(Shell shell, boolean collapseTree) throws Exception
@@ -2672,9 +2672,9 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
* a remote environment variable. This is only applicable if the subsystem factory reports
* true for supportsProperties().
* @param subject Identifies which object to get the properties of
- * @param key Identifies property to get value of
- * @param Shell parent shell used to show error message. Null means you will handle showing the error message.
- * @return Object The values of the requested keys.
+ * @param keys Identifies properties to get value of
+ * @param shell parent shell used to show error message. Null means you will handle showing the error message.
+ * @return String[] The values of the requested keys.
*/
public String[] getProperties(Object subject, String[] keys, Shell shell)
throws Exception
@@ -2979,7 +2979,7 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
*/
protected String getFirstParentFilterString(Object parent)
{
- return "*";
+ return "*"; //$NON-NLS-1$
}
diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystemConfiguration.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystemConfiguration.java
index cc7ea271a37..32a29210964 100644
--- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystemConfiguration.java
+++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystemConfiguration.java
@@ -34,6 +34,7 @@ import org.eclipse.rse.core.SystemBasePlugin;
import org.eclipse.rse.core.SystemPreferencesManager;
import org.eclipse.rse.core.internal.subsystems.RemoteServerLauncherConstants;
import org.eclipse.rse.core.internal.subsystems.SubSystemFilterNamingPolicy;
+import org.eclipse.rse.core.model.ISystemModelChangeEvents;
import org.eclipse.rse.core.references.IRSEBaseReferencingObject;
import org.eclipse.rse.filters.ISystemFilter;
import org.eclipse.rse.filters.ISystemFilterContainer;
@@ -49,7 +50,6 @@ import org.eclipse.rse.filters.SystemFilterStartHere;
import org.eclipse.rse.internal.filters.SystemFilterPoolManager;
import org.eclipse.rse.internal.model.SystemProfileManager;
import org.eclipse.rse.model.IHost;
-import org.eclipse.rse.model.ISystemModelChangeEvents;
import org.eclipse.rse.model.ISystemProfile;
import org.eclipse.rse.model.ISystemProfileManager;
import org.eclipse.rse.model.ISystemRegistry;
@@ -164,7 +164,7 @@ public abstract class SubSystemConfiguration implements ISubSystemConfiguration
{
super();
//initSubSystems();
- SystemBasePlugin.logDebugMessage(this.getClass().getName(), "STARTED SSFACTORY");
+ SystemBasePlugin.logDebugMessage(this.getClass().getName(), "STARTED SSFACTORY"); //$NON-NLS-1$
}
@@ -497,13 +497,13 @@ public abstract class SubSystemConfiguration implements ISubSystemConfiguration
// Get configured property page extenders
IConfigurationElement[] propertyPageExtensions =
- registry.getConfigurationElementsFor("org.eclipse.ui", "propertyPages");
+ registry.getConfigurationElementsFor("org.eclipse.ui", "propertyPages"); //$NON-NLS-1$ //$NON-NLS-2$
for (int i = 0; i < propertyPageExtensions.length; i++)
{
IConfigurationElement configurationElement = propertyPageExtensions[i];
- String objectClass = configurationElement.getAttribute("objectClass");
- String name = configurationElement.getAttribute("name");
+ String objectClass = configurationElement.getAttribute("objectClass"); //$NON-NLS-1$
+ String name = configurationElement.getAttribute("name"); //$NON-NLS-1$
Class objCls = null;
try
{
@@ -519,7 +519,7 @@ public abstract class SubSystemConfiguration implements ISubSystemConfiguration
{
try
{
- PropertyPage page = (PropertyPage) configurationElement.createExecutableExtension("class");
+ PropertyPage page = (PropertyPage) configurationElement.createExecutableExtension("class"); //$NON-NLS-1$
page.setTitle(name);
propertyPages.add(page);
}
@@ -737,7 +737,7 @@ public abstract class SubSystemConfiguration implements ISubSystemConfiguration
/**
* Return the category this subsystem factory subscribes to.
- * @see org.eclipse.rse.model.ISubSystemConfigurationCategories
+ * @see org.eclipse.rse.core.model.ISubSystemConfigurationCategories
*/
public String getCategory()
{
@@ -826,7 +826,7 @@ public abstract class SubSystemConfiguration implements ISubSystemConfiguration
{
ISystemValidator userIdValidator =
new ValidatorSpecialChar(
- "=;",
+ "=;", //$NON-NLS-1$
false,
RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_USERID_NOTVALID),
RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_USERID_EMPTY));
@@ -1779,7 +1779,7 @@ public abstract class SubSystemConfiguration implements ISubSystemConfiguration
//return name.equalsIgnoreCase("private");
ISystemProfile profile = getSystemProfile(mgr);
//System.out.println("Testing for user private profile for mgr " + mgr.getName() + ": " + profile.isDefaultPrivate());;
- return profile.isDefaultPrivate() || mgr.getName().equalsIgnoreCase("private");
+ return profile.isDefaultPrivate() || mgr.getName().equalsIgnoreCase("private"); //$NON-NLS-1$
}
/**
@@ -2021,10 +2021,10 @@ public abstract class SubSystemConfiguration implements ISubSystemConfiguration
if (ss.getSystemProfile() != profile) // if restoring subsystem's profile != found pool's profile
{
IHost conn = ss.getHost();
- String connectionName = conn.getSystemProfileName() + "." + conn.getAliasName();
+ String connectionName = conn.getSystemProfileName() + "." + conn.getAliasName(); //$NON-NLS-1$
SystemMessage sysMsg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_LOADING_PROFILE_SHOULDBE_ACTIVATED);
sysMsg.makeSubstitution(missingPoolMgrName, connectionName);
- SystemBasePlugin.logWarning(sysMsg.getFullMessageID() + ": " + sysMsg.getLevelOneText());
+ SystemBasePlugin.logWarning(sysMsg.getFullMessageID() + ": " + sysMsg.getLevelOneText()); //$NON-NLS-1$
if (brokenReferenceWarningsIssued.get(missingPoolMgrName) == null)
{
SystemMessageDialog msgDlg = new SystemMessageDialog(null, sysMsg);
@@ -2936,7 +2936,7 @@ public abstract class SubSystemConfiguration implements ISubSystemConfiguration
{
StringBuffer nameBuf = new StringBuffer();
nameBuf.append(profileName);
- nameBuf.append(":");
+ nameBuf.append(":"); //$NON-NLS-1$
nameBuf.append(factoryId);
/*
String name = SystemResources.RESID_DEFAULT_FILTERPOOL;
diff --git a/rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/SystemPreferencesManager.java b/rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/SystemPreferencesManager.java
index 6c083527bae..4a3ccb97d88 100644
--- a/rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/SystemPreferencesManager.java
+++ b/rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/SystemPreferencesManager.java
@@ -153,7 +153,7 @@ public class SystemPreferencesManager
public String[] getConnectionNamesOrder(String profileName)
{
String[] allConnectionNamesOrder = RemoteSystemsPreferencePage.getConnectionNamesOrder();
- profileName = profileName + ".";
+ profileName = profileName + "."; //$NON-NLS-1$
int profileNameLength = profileName.length();
Vector v = new Vector();
for (int idx=0; idx"profileName.connectionName:absolutePath".
- * @param fullyQualifiedName the fully qualified name.
+ * @param fullyQualifiedPath the fully qualified path.
*/
public RemotePath(String fullyQualifiedPath) {
@@ -125,7 +125,7 @@ public class RemotePath implements IRemotePath {
return null;
}
else {
- return profileName + "." + connectionName + ":" + absolutePath;
+ return profileName + "." + connectionName + ":" + absolutePath; //$NON-NLS-1$ //$NON-NLS-2$
}
}
@@ -147,7 +147,7 @@ public class RemotePath implements IRemotePath {
return absolutePath.substring(dotIndex+1);
}
else {
- return "";
+ return ""; //$NON-NLS-1$
}
}
else {
@@ -165,11 +165,11 @@ public class RemotePath implements IRemotePath {
return null;
}
- if (absolutePath.endsWith("/") || absolutePath.endsWith("\\")) {
+ if (absolutePath.endsWith("/") || absolutePath.endsWith("\\")) { //$NON-NLS-1$ //$NON-NLS-2$
return this;
}
else {
- String newAbsolutePath = absolutePath + "." + extension;
+ String newAbsolutePath = absolutePath + "." + extension; //$NON-NLS-1$
return new RemotePath(profileName, connectionName, newAbsolutePath);
}
}
@@ -183,7 +183,7 @@ public class RemotePath implements IRemotePath {
return null;
}
- if (absolutePath.endsWith("/") || absolutePath.endsWith("\\")) {
+ if (absolutePath.endsWith("/") || absolutePath.endsWith("\\")) { //$NON-NLS-1$ //$NON-NLS-2$
return this;
}
else {
diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/servicesubsystem/FileServiceSubSystem.java b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/servicesubsystem/FileServiceSubSystem.java
index 4b0be5b3339..3b489fec531 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/servicesubsystem/FileServiceSubSystem.java
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/servicesubsystem/FileServiceSubSystem.java
@@ -126,7 +126,7 @@ public final class FileServiceSubSystem extends RemoteFileSubSystem implements I
public String getRemoteEncoding()
{
- return System.getProperty("file.encoding");
+ return System.getProperty("file.encoding"); //$NON-NLS-1$
}
public void setHostFileToRemoteFileAdapter(IHostFileToRemoteFileAdapter hostFileAdapter)
@@ -179,7 +179,7 @@ public final class FileServiceSubSystem extends RemoteFileSubSystem implements I
int j = fofName.indexOf(ArchiveHandlerManager.VIRTUAL_SEPARATOR);
if (j == -1)
{
- if (fofName.equals("/"))
+ if (fofName.equals("/")) //$NON-NLS-1$
{
try
{
@@ -191,7 +191,7 @@ public final class FileServiceSubSystem extends RemoteFileSubSystem implements I
}
}
- if (fofName.equals(".")) {
+ if (fofName.equals(".")) { //$NON-NLS-1$
return getUserHome();
}
@@ -201,7 +201,7 @@ public final class FileServiceSubSystem extends RemoteFileSubSystem implements I
fofName = fofName.substring(0, fofName.length() - sep.length());
}
- if (fofName.endsWith(":"))
+ if (fofName.endsWith(":")) //$NON-NLS-1$
{
try
{
@@ -223,7 +223,7 @@ public final class FileServiceSubSystem extends RemoteFileSubSystem implements I
String parentPath = fofName.substring(0, lastSep);
- if (parentPath.length() == 0) parentPath = "/";
+ if (parentPath.length() == 0) parentPath = "/"; //$NON-NLS-1$
String name = fofName.substring(lastSep + 1, fofName.length());
IHostFile node = getFile(null, parentPath, name);
@@ -265,13 +265,13 @@ public final class FileServiceSubSystem extends RemoteFileSubSystem implements I
{
return _userHome;
}
- IRemoteFile root = getCachedRemoteFile(".");
+ IRemoteFile root = getCachedRemoteFile("."); //$NON-NLS-1$
if (root != null && !root.isStale()) {
return root;
}
IHostFile userHome = getFileService().getUserHome();
IRemoteFile parent = null;
- if (!userHome.getParentPath().equals("."))
+ if (!userHome.getParentPath().equals(".")) //$NON-NLS-1$
{
try
{
@@ -282,7 +282,7 @@ public final class FileServiceSubSystem extends RemoteFileSubSystem implements I
}
}
root = getHostFileToRemoteFileAdapter().convertToRemoteFile(this, getDefaultContext(), parent, userHome);
- cacheRemoteFile(root, ".");
+ cacheRemoteFile(root, "."); //$NON-NLS-1$
_userHome = root;
return root;
}
@@ -328,7 +328,7 @@ public final class FileServiceSubSystem extends RemoteFileSubSystem implements I
if (parent != null) {
parentPath = parent.getAbsolutePath();
} else {
- parentPath = "/";
+ parentPath = "/"; //$NON-NLS-1$
}
if (!parent.canRead())
@@ -358,7 +358,7 @@ public final class FileServiceSubSystem extends RemoteFileSubSystem implements I
if (parent != null) {
parentPath = parent.getAbsolutePath();
} else {
- parentPath = "/";
+ parentPath = "/"; //$NON-NLS-1$
}
if (!parent.canRead())
@@ -394,7 +394,7 @@ public final class FileServiceSubSystem extends RemoteFileSubSystem implements I
if (parent != null) {
parentPath = parent.getAbsolutePath();
} else {
- parentPath = "/";
+ parentPath = "/"; //$NON-NLS-1$
}
if (!parent.canRead())
@@ -526,7 +526,7 @@ public final class FileServiceSubSystem extends RemoteFileSubSystem implements I
if (!destination.canWrite())
{
- SystemMessage msg = RSEUIPlugin.getPluginMessage("RSEF5003").makeSubstitution(remoteFileName, getHostName());
+ SystemMessage msg = RSEUIPlugin.getPluginMessage("RSEF5003").makeSubstitution(remoteFileName, getHostName()); //$NON-NLS-1$
SystemMessageDialog dlg = new SystemMessageDialog(getShell(), msg);
dlg.open();
return;
diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFile.java b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFile.java
index 8a7755605fc..5beacc7e464 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFile.java
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFile.java
@@ -30,10 +30,10 @@ import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.jobs.ISchedulingRule;
import org.eclipse.core.runtime.jobs.MultiRule;
import org.eclipse.rse.core.SystemBasePlugin;
+import org.eclipse.rse.core.model.ISystemContentsType;
import org.eclipse.rse.core.subsystems.IRemoteContainer;
import org.eclipse.rse.core.subsystems.RemoteChildrenContentsType;
import org.eclipse.rse.model.IHost;
-import org.eclipse.rse.model.ISystemContentsType;
import org.eclipse.rse.services.clientserver.StringComparePatternMatcher;
import org.eclipse.rse.services.clientserver.archiveutils.ArchiveHandlerManager;
import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
@@ -263,7 +263,7 @@ public abstract class RemoteFile implements IRemoteFile, IAdaptable, Comparable
if (ssf != null)
return ssf.getLineSeparator();
else
- return System.getProperty("line.separator");
+ return System.getProperty("line.separator"); //$NON-NLS-1$
}
/**
* Return if this is a file on Unix, versus windows say
@@ -275,7 +275,7 @@ public abstract class RemoteFile implements IRemoteFile, IAdaptable, Comparable
if (ssf != null)
return ssf.isUnixStyle();
else
- return System.getProperty("os.name").toLowerCase().startsWith("windows");
+ return System.getProperty("os.name").toLowerCase().startsWith("windows"); //$NON-NLS-1$ //$NON-NLS-2$
}
public boolean isLink()
@@ -286,7 +286,7 @@ public abstract class RemoteFile implements IRemoteFile, IAdaptable, Comparable
{
return false;
}
- else if (classifyString.indexOf("symbolic link") > -1)
+ else if (classifyString.indexOf("symbolic link") > -1) //$NON-NLS-1$
{
return true;
}
@@ -302,7 +302,7 @@ public abstract class RemoteFile implements IRemoteFile, IAdaptable, Comparable
{
return false;
}
- else if (classifyString.indexOf("executable") > -1)
+ else if (classifyString.indexOf("executable") > -1) //$NON-NLS-1$
{
return true;
}
@@ -495,7 +495,7 @@ public abstract class RemoteFile implements IRemoteFile, IAdaptable, Comparable
public boolean isAncestorOf(IRemoteFile file)
{
String separator = this.getSeparator();
- if (this instanceof IVirtualRemoteFile) separator = "/";
+ if (this instanceof IVirtualRemoteFile) separator = "/"; //$NON-NLS-1$
if (this.isArchive()) separator = ArchiveHandlerManager.VIRTUAL_SEPARATOR;
return file.getAbsolutePathPlusConnection().startsWith(this.getAbsolutePathPlusConnection() + separator);
@@ -504,7 +504,7 @@ public abstract class RemoteFile implements IRemoteFile, IAdaptable, Comparable
public boolean isDescendantOf(IRemoteFile file)
{
String separator = file.getSeparator();
- if (this instanceof IVirtualRemoteFile) separator = "/";
+ if (this instanceof IVirtualRemoteFile) separator = "/"; //$NON-NLS-1$
if (file.isArchive()) separator = ArchiveHandlerManager.VIRTUAL_SEPARATOR;
return this.getAbsolutePathPlusConnection().startsWith(file.getAbsolutePathPlusConnection() + separator);
@@ -545,7 +545,7 @@ public abstract class RemoteFile implements IRemoteFile, IAdaptable, Comparable
}
if (filter == null) {
- filter = "*";
+ filter = "*"; //$NON-NLS-1$
}
boolean result = containsFilterKey(filters, filter);
@@ -603,7 +603,7 @@ public abstract class RemoteFile implements IRemoteFile, IAdaptable, Comparable
*/
public Object[] getContents(ISystemContentsType contentsType)
{
- return getContents(contentsType, "*");
+ return getContents(contentsType, "*"); //$NON-NLS-1$
}
private Object[] combineAndFilterHidden(Object[] set1, Object[] set2)
@@ -755,7 +755,7 @@ public abstract class RemoteFile implements IRemoteFile, IAdaptable, Comparable
}
if (filter == null) {
- filter = "*";
+ filter = "*"; //$NON-NLS-1$
}
if (filters.containsKey(filter))
@@ -861,7 +861,7 @@ public abstract class RemoteFile implements IRemoteFile, IAdaptable, Comparable
public void setContents(ISystemContentsType contentsType, String filter, Object[] con) {
if (filter == null) {
- filter = "*";
+ filter = "*"; //$NON-NLS-1$
}
if (con != null && con.length > 0)
@@ -1055,7 +1055,7 @@ public abstract class RemoteFile implements IRemoteFile, IAdaptable, Comparable
public String getComment()
{
- return "";
+ return ""; //$NON-NLS-1$
}
/*
diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFileChildrenContentsType.java b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFileChildrenContentsType.java
index dfda594be2f..99347416191 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFileChildrenContentsType.java
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFileChildrenContentsType.java
@@ -16,14 +16,14 @@
package org.eclipse.rse.subsystems.files.core.subsystems;
-import org.eclipse.rse.model.ISystemContentsType;
+import org.eclipse.rse.core.model.ISystemContentsType;
/**
* Represents contents that are children of a container
*/
public class RemoteFileChildrenContentsType implements ISystemContentsType
{
- public static String CONTENTS_TYPE_CHILDREN = "contents_file_children";
+ public static String CONTENTS_TYPE_CHILDREN = "contents_file_children"; //$NON-NLS-1$
public static RemoteFileChildrenContentsType _instance = new RemoteFileChildrenContentsType();
public static RemoteFileChildrenContentsType getInstance()
diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFileSubSystem.java b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFileSubSystem.java
index 488cc9bf717..f8e86006cb3 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFileSubSystem.java
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFileSubSystem.java
@@ -35,6 +35,9 @@ import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.OperationCanceledException;
import org.eclipse.rse.core.SystemBasePlugin;
+import org.eclipse.rse.core.model.ISystemMessageObject;
+import org.eclipse.rse.core.model.SystemChildrenContentsType;
+import org.eclipse.rse.core.model.SystemMessageObject;
import org.eclipse.rse.core.subsystems.CommunicationsEvent;
import org.eclipse.rse.core.subsystems.ICommunicationsListener;
import org.eclipse.rse.core.subsystems.IConnectorService;
@@ -44,9 +47,6 @@ import org.eclipse.rse.core.subsystems.SubSystem;
import org.eclipse.rse.filters.ISystemFilterReference;
import org.eclipse.rse.filters.ISystemFilterString;
import org.eclipse.rse.model.IHost;
-import org.eclipse.rse.model.ISystemMessageObject;
-import org.eclipse.rse.model.SystemChildrenContentsType;
-import org.eclipse.rse.model.SystemMessageObject;
import org.eclipse.rse.model.SystemRemoteResourceSet;
import org.eclipse.rse.services.clientserver.FileTypeMatcher;
import org.eclipse.rse.services.clientserver.IClientServerConstants;
@@ -285,11 +285,11 @@ public abstract class RemoteFileSubSystem extends SubSystem implements IRemoteFi
{
RemoteFileFilterString rffs = new RemoteFileFilterString(getParentRemoteFileSubSystemConfiguration(), filterString);
// ok, this is a tweak: if the absolute name has " -folder" at the end, that means it is a folder...
- if (remoteObjectAbsoluteName.endsWith(" -folder"))
+ if (remoteObjectAbsoluteName.endsWith(" -folder")) //$NON-NLS-1$
{
if (!rffs.getShowSubDirs())
return false;
- remoteObjectAbsoluteName = remoteObjectAbsoluteName.substring(0, remoteObjectAbsoluteName.indexOf(" -folder"));
+ remoteObjectAbsoluteName = remoteObjectAbsoluteName.substring(0, remoteObjectAbsoluteName.indexOf(" -folder")); //$NON-NLS-1$
}
// problem 1: we don't know if the given remote object name represents a file or folder. We have to assume a file,
// since we don't support filtering by folder names.
@@ -301,7 +301,7 @@ public abstract class RemoteFileSubSystem extends SubSystem implements IRemoteFi
if (container == null)
return false;
- if (container.equals("."))
+ if (container.equals(".")) //$NON-NLS-1$
{
try
{
@@ -328,10 +328,10 @@ public abstract class RemoteFileSubSystem extends SubSystem implements IRemoteFi
String nameFilter = rffs.getFileOrTypes();
if (nameFilter == null)
return false;
- if (!nameFilter.equals("*"))
+ if (!nameFilter.equals("*")) //$NON-NLS-1$
{
IMatcher matcher = null;
- if (nameFilter.endsWith(","))
+ if (nameFilter.endsWith(",")) //$NON-NLS-1$
matcher = new FileTypeMatcher(FileTypeMatcher.parseTypes(nameFilter), true);
else
matcher = new NamePatternMatcher(nameFilter, true, caseSensitive);
@@ -468,7 +468,7 @@ public abstract class RemoteFileSubSystem extends SubSystem implements IRemoteFi
RemoteFileFilterString currFS = new RemoteFileFilterString(getParentRemoteFileSubSystemConfiguration(), allFilterStrings[currFilterStringIndex]);
String currPath = currFS.getPath();
if (currPath == null)
- currPath = "";
+ currPath = ""; //$NON-NLS-1$
boolean matchingPaths = false;
boolean caseSensitive = getParentRemoteFileSubSystemConfiguration().isCaseSensitive();
// test if we are listing in the same folder as any previous filter string...
@@ -478,7 +478,7 @@ public abstract class RemoteFileSubSystem extends SubSystem implements IRemoteFi
RemoteFileFilterString prevFS = new RemoteFileFilterString(getParentRemoteFileSubSystemConfiguration(), allFilterStrings[idx]);
String prevPath = prevFS.getPath();
if (prevPath == null)
- prevPath = "";
+ prevPath = ""; //$NON-NLS-1$
if ((caseSensitive && prevPath.equals(currPath)) || (!caseSensitive && prevPath.equalsIgnoreCase(currPath)))
{
@@ -501,7 +501,7 @@ public abstract class RemoteFileSubSystem extends SubSystem implements IRemoteFi
IRemoteFile child = (IRemoteFile) childrenForThisFilterString[jdx];
String path1 = child.getAbsolutePath();
if (path1 == null)
- path1 = "";
+ path1 = ""; //$NON-NLS-1$
IRemoteFile match = null;
for (int idx = 0;(match == null) && (idx < allChildrenSoFar.size()); idx++)
{
@@ -510,7 +510,7 @@ public abstract class RemoteFileSubSystem extends SubSystem implements IRemoteFi
{
String path2 = ((IRemoteFile) prevChild).getAbsolutePath();
if (path2 == null)
- path2 = "";
+ path2 = ""; //$NON-NLS-1$
if (path1.equals(path2))
match = (IRemoteFile) prevChild;
}
@@ -555,11 +555,11 @@ public abstract class RemoteFileSubSystem extends SubSystem implements IRemoteFi
boolean windows = !rfssf.isUnixStyle();
if (debugMode)
SystemBasePlugin.logInfo("INTERNALRESOLVEFILTERSTRING: INPUT FILTERSTRING: " + filterString);
- if (filterString.startsWith("/") && windows) // request to list root files?
+ if (filterString.startsWith("/") && windows) // request to list root files? //$NON-NLS-1$
{ // convert to request to list drives on Windows
int len = filterString.length();
if (len == 1)
- filterString = "*"; // hmm, should never happen
+ filterString = "*"; // hmm, should never happen //$NON-NLS-1$
else
filterString = filterString.substring(1);
if (debugMode)
@@ -701,7 +701,7 @@ public abstract class RemoteFileSubSystem extends SubSystem implements IRemoteFi
{
RemoteFileFilterString[] allFilterStrings = ((IRemoteFile) parent).getAllFilterStrings();
if ((allFilterStrings == null) || (allFilterStrings.length == 0))
- return "*";
+ return "*"; //$NON-NLS-1$
else
{
return allFilterStrings[0].getFileOrTypes();
@@ -732,7 +732,7 @@ public abstract class RemoteFileSubSystem extends SubSystem implements IRemoteFi
// this is all for defect 42095. Phil
RemoteFileFilterString[] allFilterStrings = ((IRemoteFile) parent).getAllFilterStrings();
if (allFilterStrings == null)
- fs = new RemoteFileFilterString(getParentRemoteFileSubSystemConfiguration(), "*");
+ fs = new RemoteFileFilterString(getParentRemoteFileSubSystemConfiguration(), "*"); //$NON-NLS-1$
else
{
boolean onlyOne = (allFilterStrings.length == 1);
@@ -856,7 +856,7 @@ public abstract class RemoteFileSubSystem extends SubSystem implements IRemoteFi
{
RemoteFileFilterString filterString = new RemoteFileFilterString(getParentRemoteFileSubSystemConfiguration());
filterString.setPath(parent.getAbsolutePath());
- filterString.setFile((fileNameFilter == null) ? "*" : fileNameFilter);
+ filterString.setFile((fileNameFilter == null) ? "*" : fileNameFilter); //$NON-NLS-1$
filterString.setShowFiles(false);
filterString.setShowSubDirs(true);
RemoteFileContext context = new RemoteFileContext(this, parent, filterString);
@@ -915,7 +915,7 @@ public abstract class RemoteFileSubSystem extends SubSystem implements IRemoteFi
RemoteFileFilterString filterString = new RemoteFileFilterString(getParentRemoteFileSubSystemConfiguration());
filterString.setPath(parent.getAbsolutePath());
if (fileNameFilter == null)
- fileNameFilter = "*";
+ fileNameFilter = "*"; //$NON-NLS-1$
filterString.setFile(fileNameFilter);
filterString.setShowFiles(true);
filterString.setShowSubDirs(true);
@@ -1105,9 +1105,9 @@ public abstract class RemoteFileSubSystem extends SubSystem implements IRemoteFi
protected void setListValues(int includeFilesOrFolders, String nameFilter)
{
this.includeFilesOrFolders = includeFilesOrFolders;
- if ((nameFilter != null) && !nameFilter.equals("*"))
+ if ((nameFilter != null) && !nameFilter.equals("*")) //$NON-NLS-1$
{
- if (nameFilter.endsWith(","))
+ if (nameFilter.endsWith(",")) //$NON-NLS-1$
matcher = new FileTypeMatcher(FileTypeMatcher.parseTypes(nameFilter), isCaseSensitive());
else
matcher = new NamePatternMatcher(nameFilter, true, isCaseSensitive());
@@ -1126,7 +1126,7 @@ public abstract class RemoteFileSubSystem extends SubSystem implements IRemoteFi
protected void setListValues(int includeFilesOrFolders, String folderNameFilter, String fileNameFilter)
{
setListValues(includeFilesOrFolders, fileNameFilter);
- if ((folderNameFilter != null) && !folderNameFilter.equals("*"))
+ if ((folderNameFilter != null) && !folderNameFilter.equals("*")) //$NON-NLS-1$
folderNameMatcher = new NamePatternMatcher(folderNameFilter, true, isCaseSensitive());
}
@@ -1195,7 +1195,7 @@ public abstract class RemoteFileSubSystem extends SubSystem implements IRemoteFi
*/
public void download(IRemoteFile source, String destination, IProgressMonitor monitor) throws RemoteFileSecurityException, RemoteFileIOException
{
- download(source, destination, System.getProperty("file.encoding"), monitor);
+ download(source, destination, System.getProperty("file.encoding"), monitor); //$NON-NLS-1$
}
/**
@@ -1306,7 +1306,7 @@ public abstract class RemoteFileSubSystem extends SubSystem implements IRemoteFi
*/
public void upload(String source, IRemoteFile destination, IProgressMonitor monitor) throws RemoteFileSecurityException, RemoteFileIOException
{
- upload(source, destination, System.getProperty("file.encoding"), monitor);
+ upload(source, destination, System.getProperty("file.encoding"), monitor); //$NON-NLS-1$
destination.markStale(true);
}
@@ -1333,7 +1333,7 @@ public abstract class RemoteFileSubSystem extends SubSystem implements IRemoteFi
*/
public void upload(String source, String destination, IProgressMonitor monitor) throws RemoteFileSecurityException, RemoteFileIOException
{
- upload(source, SystemEncodingUtil.ENCODING_UTF_8, destination, System.getProperty("file.encoding"), monitor);
+ upload(source, SystemEncodingUtil.ENCODING_UTF_8, destination, System.getProperty("file.encoding"), monitor); //$NON-NLS-1$
}
/**
@@ -1570,8 +1570,8 @@ public abstract class RemoteFileSubSystem extends SubSystem implements IRemoteFi
{
if (_cachedRemoteFiles.size() > 0)
{
- path = path.replaceAll("//", "/");
- if (path.endsWith("\\") || (path.endsWith("/") && path.length() > 1))
+ path = path.replaceAll("//", "/"); //$NON-NLS-1$ //$NON-NLS-2$
+ if (path.endsWith("\\") || (path.endsWith("/") && path.length() > 1)) //$NON-NLS-1$ //$NON-NLS-2$
{
path = path.substring(0, path.length() - 1);
}
@@ -1643,10 +1643,8 @@ public abstract class RemoteFileSubSystem extends SubSystem implements IRemoteFi
*/
public String toString()
{
-
-
StringBuffer result = new StringBuffer(super.toString());
- result.append(" (homeFolder: ");
+ result.append(" (homeFolder: "); //$NON-NLS-1$
result.append(homeFolder);
result.append(')');
return result.toString();
diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFileSubSystemConfiguration.java b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFileSubSystemConfiguration.java
index 5eb1e32c7cc..7b3ce41d4ad 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFileSubSystemConfiguration.java
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFileSubSystemConfiguration.java
@@ -190,10 +190,10 @@ public abstract class RemoteFileSubSystemConfiguration extends SubSystemConfigur
public String getLineSeparator()
{
if (isUnixStyle()) {
- return "\n";
+ return "\n"; //$NON-NLS-1$
}
else {
- return "\r\n";
+ return "\r\n"; //$NON-NLS-1$
}
}
// --------------------------------------------
@@ -346,7 +346,7 @@ public abstract class RemoteFileSubSystemConfiguration extends SubSystemConfigur
filterStrings = new Vector();
RemoteFileFilterString myHomeFilterString = new RemoteFileFilterString(this);
myHomeFilterString.setPath(getSeparator());
- filterStrings.add("./*");
+ filterStrings.add("./*"); //$NON-NLS-1$
ISystemFilter filter = mgr.createSystemFilter(pool, SystemFileResources.RESID_FILTER_MYHOME,filterStrings);
filter.setNonChangable(true);
filter.setSingleFilterStringOnly(true);
@@ -460,7 +460,7 @@ public abstract class RemoteFileSubSystemConfiguration extends SubSystemConfigur
*/
public String getEditorProfileID()
{
- return "universal";
+ return "universal"; //$NON-NLS-1$
}
diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFolderChildrenContentsType.java b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFolderChildrenContentsType.java
index 6d80aee2cdf..40afbdaa554 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFolderChildrenContentsType.java
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFolderChildrenContentsType.java
@@ -16,14 +16,14 @@
package org.eclipse.rse.subsystems.files.core.subsystems;
-import org.eclipse.rse.model.ISystemContentsType;
+import org.eclipse.rse.core.model.ISystemContentsType;
/**
* Represents contents that are children of a container
*/
public class RemoteFolderChildrenContentsType implements ISystemContentsType
{
- public static String CONTENTS_TYPE_CHILDREN = "contents_folder_children";
+ public static String CONTENTS_TYPE_CHILDREN = "contents_folder_children"; //$NON-NLS-1$
public static RemoteFolderChildrenContentsType _instance = new RemoteFolderChildrenContentsType();
public static RemoteFolderChildrenContentsType getInstance()
diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteSearchResultsContentsType.java b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteSearchResultsContentsType.java
index 66d22d984f4..929193451e5 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteSearchResultsContentsType.java
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteSearchResultsContentsType.java
@@ -16,14 +16,14 @@
package org.eclipse.rse.subsystems.files.core.subsystems;
-import org.eclipse.rse.model.ISystemContentsType;
+import org.eclipse.rse.core.model.ISystemContentsType;
/**
* Represents contents that are children of a container
*/
public class RemoteSearchResultsContentsType implements ISystemContentsType
{
- public static String CONTENTS_TYPE_SEARCH_RESULTS = "contents_search_results";
+ public static String CONTENTS_TYPE_SEARCH_RESULTS = "contents_search_results"; //$NON-NLS-1$
public static RemoteSearchResultsContentsType _instance = new RemoteSearchResultsContentsType();
public static RemoteSearchResultsContentsType getInstance()
diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/subsystems/files/local/LocalFileSubSystemConfiguration.java b/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/subsystems/files/local/LocalFileSubSystemConfiguration.java
index 9d22f63607f..277f8dc7252 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/subsystems/files/local/LocalFileSubSystemConfiguration.java
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/subsystems/files/local/LocalFileSubSystemConfiguration.java
@@ -124,7 +124,7 @@ public class LocalFileSubSystemConfiguration extends FileServiceSubSystemConfigu
// Create 'My Home' filter for local (should apply to both _isWindows and linux clients)
filterName = SystemFileResources.RESID_FILTER_MYHOME;
RemoteFileFilterString myDocsFilterString = new RemoteFileFilterString(this);
- myDocsFilterString.setPath(System.getProperty("user.home") + getSeparator());
+ myDocsFilterString.setPath(System.getProperty("user.home") + getSeparator()); //$NON-NLS-1$
Vector myDocsFilterStrings = new Vector();
myDocsFilterStrings.add(myDocsFilterString.toString());
mgr.createSystemFilter(pool, filterName, myDocsFilterStrings);
diff --git a/rse/plugins/org.eclipse.rse.subsystems.processes.core/src/org/eclipse/rse/subsystems/processes/core/subsystem/impl/RemoteProcessImpl.java b/rse/plugins/org.eclipse.rse.subsystems.processes.core/src/org/eclipse/rse/subsystems/processes/core/subsystem/impl/RemoteProcessImpl.java
index d0f543540e8..637b09065d9 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.processes.core/src/org/eclipse/rse/subsystems/processes/core/subsystem/impl/RemoteProcessImpl.java
+++ b/rse/plugins/org.eclipse.rse.subsystems.processes.core/src/org/eclipse/rse/subsystems/processes/core/subsystem/impl/RemoteProcessImpl.java
@@ -155,7 +155,7 @@ public class RemoteProcessImpl implements IRemoteProcess, ISystemProcessRemoteCo
*/
public String getAbsolutePath()
{
- return "/proc/" + getPid();
+ return "/proc/" + getPid(); //$NON-NLS-1$
}
/* (non-Javadoc)
diff --git a/rse/plugins/org.eclipse.rse.subsystems.processes.core/src/org/eclipse/rse/subsystems/processes/servicesubsystem/ProcessServiceSubSystem.java b/rse/plugins/org.eclipse.rse.subsystems.processes.core/src/org/eclipse/rse/subsystems/processes/servicesubsystem/ProcessServiceSubSystem.java
index 30f950941fb..f27986ef948 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.processes.core/src/org/eclipse/rse/subsystems/processes/servicesubsystem/ProcessServiceSubSystem.java
+++ b/rse/plugins/org.eclipse.rse.subsystems.processes.core/src/org/eclipse/rse/subsystems/processes/servicesubsystem/ProcessServiceSubSystem.java
@@ -92,7 +92,7 @@ public class ProcessServiceSubSystem extends RemoteProcessSubSystemImpl implemen
{
checkIsConnected();
HostProcessFilterImpl rpfs = new HostProcessFilterImpl();
- rpfs.setPid("" + pid);
+ rpfs.setPid("" + pid); //$NON-NLS-1$
IRemoteProcessContext context = new RemoteProcessContext(this, null, rpfs);
IHostProcess process = getProcessService().getProcess(null, pid);
return getHostProcessToRemoteProcessAdapter().convertToRemoteProcess(context, null, process);
diff --git a/rse/plugins/org.eclipse.rse.subsystems.processes.local/src/org/eclipse/rse/subsystems/processes/local/LocalProcessSubSystemConfiguration.java b/rse/plugins/org.eclipse.rse.subsystems.processes.local/src/org/eclipse/rse/subsystems/processes/local/LocalProcessSubSystemConfiguration.java
index 4c2a5ca293b..9310a45453b 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.processes.local/src/org/eclipse/rse/subsystems/processes/local/LocalProcessSubSystemConfiguration.java
+++ b/rse/plugins/org.eclipse.rse.subsystems.processes.local/src/org/eclipse/rse/subsystems/processes/local/LocalProcessSubSystemConfiguration.java
@@ -65,14 +65,14 @@ public class LocalProcessSubSystemConfiguration extends ProcessServiceSubSystemC
}
/**
- * @return
+ * @return false
*/
public boolean supportsSearch() {
return false;
}
/**
- * @return
+ * @return false
*/
public boolean supportsEnvironmentVariablesPropertyPage() {
return false;
diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/subsystems/servicesubsystem/ShellServiceSubSystem.java b/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/subsystems/servicesubsystem/ShellServiceSubSystem.java
index 8d286823abc..c8d99f82b1b 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/subsystems/servicesubsystem/ShellServiceSubSystem.java
+++ b/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/subsystems/servicesubsystem/ShellServiceSubSystem.java
@@ -64,16 +64,16 @@ public final class ShellServiceSubSystem extends RemoteCmdSubSystem implements I
{
if (getSystemType() == IRSESystemType.SYSTEMTYPE_WINDOWS)
{
- _userHome = "c:\\";
+ _userHome = "c:\\"; //$NON-NLS-1$
}
else if (getSystemType() == IRSESystemType.SYSTEMTYPE_LOCAL)
{
- _userHome = System.getProperty("user.home");
+ _userHome = System.getProperty("user.home"); //$NON-NLS-1$
}
else
{
// Assume UNIX compatible file system
- _userHome = "/home/" + getUserId();
+ _userHome = "/home/" + getUserId(); //$NON-NLS-1$
}
}
return _userHome;
@@ -87,7 +87,7 @@ public final class ShellServiceSubSystem extends RemoteCmdSubSystem implements I
protected Object[] internalRunCommand(IProgressMonitor monitor, String cmd, Object context, boolean interpretOutput) throws InvocationTargetException, InterruptedException, SystemMessageException
{
- String cwd = "";
+ String cwd = ""; //$NON-NLS-1$
if (context instanceof IRemoteFile)
{
IRemoteFile file = (IRemoteFile) context;
@@ -98,7 +98,7 @@ public final class ShellServiceSubSystem extends RemoteCmdSubSystem implements I
// assume the string is a remote path
cwd = (String)context;
}
- if (cwd == null || cwd.equals("null"))
+ if (cwd == null || cwd.equals("null")) //$NON-NLS-1$
{
cwd = getUserHome();
}
@@ -124,7 +124,7 @@ public final class ShellServiceSubSystem extends RemoteCmdSubSystem implements I
protected IRemoteCommandShell internalRunShell(IProgressMonitor monitor, Object context) throws InvocationTargetException, InterruptedException, SystemMessageException
{
- String cwd = "";
+ String cwd = ""; //$NON-NLS-1$
if (context instanceof IRemoteFile)
{
IRemoteFile file = (IRemoteFile) context;
@@ -135,7 +135,7 @@ public final class ShellServiceSubSystem extends RemoteCmdSubSystem implements I
// assume the string is a remote path
cwd = (String)context;
}
- if (cwd == null || cwd.equals("null"))
+ if (cwd == null || cwd.equals("null")) //$NON-NLS-1$
{
cwd = getUserHome();
}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java
index 06dd39e6391..4c22e52adfa 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java
@@ -56,6 +56,8 @@ import org.eclipse.rse.core.SystemBasePlugin;
import org.eclipse.rse.core.SystemElapsedTimer;
import org.eclipse.rse.core.SystemPopupMenuActionContributorManager;
import org.eclipse.rse.core.SystemPreferencesManager;
+import org.eclipse.rse.core.model.ISystemContainer;
+import org.eclipse.rse.core.model.ISystemMessageObject;
import org.eclipse.rse.core.references.IRSEBaseReferencingObject;
import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.filters.ISystemFilter;
@@ -69,8 +71,6 @@ import org.eclipse.rse.filters.ISystemFilterReference;
import org.eclipse.rse.filters.ISystemFilterString;
import org.eclipse.rse.filters.ISystemFilterStringReference;
import org.eclipse.rse.model.IHost;
-import org.eclipse.rse.model.ISystemContainer;
-import org.eclipse.rse.model.ISystemMessageObject;
import org.eclipse.rse.model.ISystemPromptableObject;
import org.eclipse.rse.model.ISystemRegistry;
import org.eclipse.rse.model.ISystemRemoteChangeEvent;
@@ -415,7 +415,7 @@ public class SystemView extends TreeViewer implements ISystemTree,
// -----------------------------
// Enable right-click popup menu
// -----------------------------
- menuMgr = new MenuManager("#PopupMenu");
+ menuMgr = new MenuManager("#PopupMenu"); //$NON-NLS-1$
menuMgr.setRemoveAllWhenShown(true);
menuMgr.addMenuListener(this);
Menu menu = menuMgr.createContextMenu(getTree());
@@ -519,7 +519,7 @@ public class SystemView extends TreeViewer implements ISystemTree,
{
if ((event.character == SWT.DEL) && (event.stateMask == 0) && (((IStructuredSelection)getSelection()).size()>0) )
{
- scanSelections("handleKeyPressed");
+ scanSelections("handleKeyPressed"); //$NON-NLS-1$
/* DKM - 53694
if (showDelete() && canDelete())
{
@@ -859,7 +859,7 @@ public class SystemView extends TreeViewer implements ISystemTree,
// WHEN THAT CHANGES, WILL CALL CANDELETE() HERE. THAT IN TURN WILL CALL SCANSELECTIONS.
// THIS MEANS SCAN SELECTIONS GETS CALL TWICE ON MOST RIGHT CLICK ACTIONS.
if (!selectionFlagsUpdated) // might already be called by the global delete action wh
- scanSelections("fillContextMenu");
+ scanSelections("fillContextMenu"); //$NON-NLS-1$
// ADD COMMON ACTIONS...
@@ -1189,13 +1189,13 @@ public class SystemView extends TreeViewer implements ISystemTree,
return;
else
{
- logMyDebugMessage(this.getClass().getName(),": -----------------------------------------------------------");
- logMyDebugMessage(this.getClass().getName(),": REMOTE SSFID.......: " + element.getSubSystemConfigurationId(firstSelection));
- logMyDebugMessage(this.getClass().getName(),": REMOTE NAME........: " + element.getName(firstSelection));
- logMyDebugMessage(this.getClass().getName(),": REMOTE TYPECATEGORY: " + element.getRemoteTypeCategory(firstSelection));
- logMyDebugMessage(this.getClass().getName(),": REMOTE TYPE........: " + element.getRemoteType(firstSelection));
- logMyDebugMessage(this.getClass().getName(),": REMOTE SUBTYPE.....: " + element.getRemoteSubType(firstSelection));
- logMyDebugMessage(this.getClass().getName(),": REMOTE SUBSUBTYPE..: " + element.getRemoteSubSubType(firstSelection));
+ logMyDebugMessage(this.getClass().getName(),": -----------------------------------------------------------"); //$NON-NLS-1$
+ logMyDebugMessage(this.getClass().getName(),": REMOTE SSFID.......: " + element.getSubSystemConfigurationId(firstSelection)); //$NON-NLS-1$
+ logMyDebugMessage(this.getClass().getName(),": REMOTE NAME........: " + element.getName(firstSelection)); //$NON-NLS-1$
+ logMyDebugMessage(this.getClass().getName(),": REMOTE TYPECATEGORY: " + element.getRemoteTypeCategory(firstSelection)); //$NON-NLS-1$
+ logMyDebugMessage(this.getClass().getName(),": REMOTE TYPE........: " + element.getRemoteType(firstSelection)); //$NON-NLS-1$
+ logMyDebugMessage(this.getClass().getName(),": REMOTE SUBTYPE.....: " + element.getRemoteSubType(firstSelection)); //$NON-NLS-1$
+ logMyDebugMessage(this.getClass().getName(),": REMOTE SUBSUBTYPE..: " + element.getRemoteSubSubType(firstSelection)); //$NON-NLS-1$
}
}
}
@@ -1204,7 +1204,7 @@ public class SystemView extends TreeViewer implements ISystemTree,
if (!debugProperties)
return;
//RSEUIPlugin.logDebugMessage(prefix, msg);
- System.out.println(prefix+" "+msg);
+ System.out.println(prefix+" "+msg); //$NON-NLS-1$
}
/**
@@ -1421,7 +1421,7 @@ public class SystemView extends TreeViewer implements ISystemTree,
if (doTimings && (item instanceof TreeItem) && (((TreeItem)item).getData() != null))
{
elapsedTime.setEndTime();
- System.out.println("Time to expand for " + ((TreeItem)item).getItemCount() + " items: " + elapsedTime);
+ System.out.println("Time to expand for " + ((TreeItem)item).getItemCount() + " items: " + elapsedTime); //$NON-NLS-1$ //$NON-NLS-2$
}
}
@@ -1809,7 +1809,7 @@ public class SystemView extends TreeViewer implements ISystemTree,
case EVENT_ADD_RELATIVE:
if (debug)
{
- logDebugMsg("SV event: EVENT_ADD ");
+ logDebugMsg("SV event: EVENT_ADD "); //$NON-NLS-1$
}
clearSelection();
//refresh(parent);
@@ -1850,7 +1850,7 @@ public class SystemView extends TreeViewer implements ISystemTree,
case EVENT_ADD_MANY:
if (debug)
{
- logDebugMsg("SV event: EVENT_ADD_MANY");
+ logDebugMsg("SV event: EVENT_ADD_MANY"); //$NON-NLS-1$
}
multiSource = _event.getMultiSource();
clearSelection();
@@ -1892,7 +1892,7 @@ public class SystemView extends TreeViewer implements ISystemTree,
for (int idx=0; idx
*
@@ -223,13 +224,13 @@ public class SubSystemConfigurationAdapter implements ISubSystemConfigurationAda
// Get configured property page extenders
IConfigurationElement[] propertyPageExtensions =
- registry.getConfigurationElementsFor("org.eclipse.ui", "propertyPages");
+ registry.getConfigurationElementsFor("org.eclipse.ui", "propertyPages"); //$NON-NLS-1$ //$NON-NLS-2$
for (int i = 0; i < propertyPageExtensions.length; i++)
{
IConfigurationElement configurationElement = propertyPageExtensions[i];
- String objectClass = configurationElement.getAttribute("objectClass");
- String name = configurationElement.getAttribute("name");
+ String objectClass = configurationElement.getAttribute("objectClass"); //$NON-NLS-1$
+ String name = configurationElement.getAttribute("name"); //$NON-NLS-1$
Class objCls = null;
try
{
@@ -245,7 +246,7 @@ public class SubSystemConfigurationAdapter implements ISubSystemConfigurationAda
{
try
{
- PropertyPage page = (PropertyPage) configurationElement.createExecutableExtension("class");
+ PropertyPage page = (PropertyPage) configurationElement.createExecutableExtension("class"); //$NON-NLS-1$
page.setTitle(name);
propertyPages.add(page);
}
@@ -672,10 +673,10 @@ public class SubSystemConfigurationAdapter implements ISubSystemConfigurationAda
{
IAction[] actions = new IAction[2];
actions[0] = new SystemFilterNewFilterPoolAction(shell);
- ((ISystemAction) actions[0]).setHelp(RSEUIPlugin.HELPPREFIX + "actn0040");
- ((SystemFilterNewFilterPoolAction) actions[0]).setDialogHelp(RSEUIPlugin.HELPPREFIX + "wnfp0000");
+ ((ISystemAction) actions[0]).setHelp(RSEUIPlugin.HELPPREFIX + "actn0040"); //$NON-NLS-1$
+ ((SystemFilterNewFilterPoolAction) actions[0]).setDialogHelp(RSEUIPlugin.HELPPREFIX + "wnfp0000"); //$NON-NLS-1$
actions[1] = new SystemFilterCascadingNewFilterPoolReferenceAction(shell, selectedSubSystem.getSystemFilterPoolReferenceManager());
- ((ISystemAction) actions[1]).setHelp(RSEUIPlugin.HELPPREFIX + "actn0041");
+ ((ISystemAction) actions[1]).setHelp(RSEUIPlugin.HELPPREFIX + "actn0041"); //$NON-NLS-1$
return actions;
}
/**
@@ -764,7 +765,7 @@ public class SubSystemConfigurationAdapter implements ISubSystemConfigurationAda
* creating a new filter. In this case, override getNewFilterAction()
* To add additional actions, override {@link #getAdditionalFilterPoolActions(ISystemFilterPool selectedPool, Shell shell)}.
*
- * @param pool the currently selected pool
+ * @param selectedPool the currently selected pool
* @param shell parent shell of viewer where the popup menu is being constructed
*/
public IAction[] getFilterPoolActions(ISubSystemConfiguration factory, ISystemFilterPool selectedPool, Shell shell)
@@ -790,12 +791,12 @@ public class SubSystemConfigurationAdapter implements ISubSystemConfigurationAda
filterPoolActions = new IAction[nbr];
SystemFilterCopyFilterPoolAction copyAction = new SystemFilterCopyFilterPoolAction(shell);
copyAction.setPromptString(SystemResources.RESID_COPY_TARGET_PROFILE_PROMPT);
- copyAction.setHelp(RSEUIPlugin.HELPPREFIX + "actn0060");
- copyAction.setDialogHelp(RSEUIPlugin.HELPPREFIX + "dcfp0000");
+ copyAction.setHelp(RSEUIPlugin.HELPPREFIX + "actn0060"); //$NON-NLS-1$
+ copyAction.setDialogHelp(RSEUIPlugin.HELPPREFIX + "dcfp0000"); //$NON-NLS-1$
SystemFilterMoveFilterPoolAction moveAction = new SystemFilterMoveFilterPoolAction(shell);
moveAction.setPromptString(SystemResources.RESID_MOVE_TARGET_PROFILE_PROMPT);
- moveAction.setHelp(RSEUIPlugin.HELPPREFIX + "actn0061");
- moveAction.setDialogHelp(RSEUIPlugin.HELPPREFIX + "dmfp0000");
+ moveAction.setHelp(RSEUIPlugin.HELPPREFIX + "actn0061"); //$NON-NLS-1$
+ moveAction.setDialogHelp(RSEUIPlugin.HELPPREFIX + "dmfp0000"); //$NON-NLS-1$
filterPoolActions[0] = copyAction;
filterPoolActions[1] = moveAction;
}
@@ -855,8 +856,8 @@ public class SubSystemConfigurationAdapter implements ISubSystemConfigurationAda
protected IAction getNewFilterPoolFilterAction(ISubSystemConfiguration factory, ISystemFilterPool selectedPool, Shell shell)
{
SystemNewFilterAction action = new SystemNewFilterAction(shell, selectedPool);
- action.setHelp(RSEUIPlugin.HELPPREFIX + "actn0042");
- action.setDialogHelp(RSEUIPlugin.HELPPREFIX + "wnfr0000");
+ action.setHelp(RSEUIPlugin.HELPPREFIX + "actn0042"); //$NON-NLS-1$
+ action.setDialogHelp(RSEUIPlugin.HELPPREFIX + "wnfr0000"); //$NON-NLS-1$
return action;
}
/**
@@ -888,8 +889,8 @@ public class SubSystemConfigurationAdapter implements ISubSystemConfigurationAda
return null;
}*/
SystemChangeFilterAction action = new SystemChangeFilterAction(shell);
- action.setHelp(RSEUIPlugin.HELPPREFIX + "actn0081");
- action.setDialogHelp(RSEUIPlugin.HELPPREFIX + "dufr0000");
+ action.setHelp(RSEUIPlugin.HELPPREFIX + "actn0081"); //$NON-NLS-1$
+ action.setDialogHelp(RSEUIPlugin.HELPPREFIX + "dufr0000"); //$NON-NLS-1$
return action;
}
/**
@@ -905,14 +906,14 @@ public class SubSystemConfigurationAdapter implements ISubSystemConfigurationAda
* {@link org.eclipse.rse.ui.filters.dialogs.SystemChangeFilterDialog} you will have to override this method
* and specify the following information for the supplied page (via its setters):
*
- *
*/
public class SystemHostCombo extends Composite implements ISelectionProvider, ISystemCombo,
@@ -686,7 +686,7 @@ public class SystemHostCombo extends Composite implements ISelectionProvider, IS
{
boolean matchFound = false;
IHost[] additionalConnections = null;
- if ( (systemType == null) || (systemType.equals("*")) )
+ if ( (systemType == null) || (systemType.equals("*")) ) //$NON-NLS-1$
additionalConnections = RSEUIPlugin.getTheSystemRegistry().getHosts();
else
additionalConnections = RSEUIPlugin.getTheSystemRegistry().getHostsBySystemType(systemType);
@@ -867,7 +867,7 @@ public class SystemHostCombo extends Composite implements ISelectionProvider, IS
//connectionName = sub(connectionName,"%2",conn.getSystemProfileName());
//return connectionName;
if (showQualifiedNames)
- return conn.getSystemProfileName() + "." + conn.getAliasName();
+ return conn.getSystemProfileName() + "." + conn.getAliasName(); //$NON-NLS-1$
else
return conn.getAliasName();
}
@@ -1029,7 +1029,7 @@ public class SystemHostCombo extends Composite implements ISelectionProvider, IS
protected void setConnectionToolTipText()
{
- String tooltipText = "";
+ String tooltipText = ""; //$NON-NLS-1$
IHost currConn = getHost();
if (currConn != null)
tooltipText = currConn.getHostName();
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/SystemSelectConnectionForm.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/SystemSelectConnectionForm.java
index 782d0f99667..af67d793b4f 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/SystemSelectConnectionForm.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/SystemSelectConnectionForm.java
@@ -307,8 +307,8 @@ public class SystemSelectConnectionForm extends SystemBaseForm
((GridData)ps_composite.getLayoutData()).verticalAlignment = GridData.FILL;
// SPACER LINES
- spacer1 = SystemWidgetHelpers.createLabel(ps_composite, "", 1);
- spacer2 = SystemWidgetHelpers.createLabel(ps_composite, "", 1);
+ spacer1 = SystemWidgetHelpers.createLabel(ps_composite, "", 1); //$NON-NLS-1$
+ spacer2 = SystemWidgetHelpers.createLabel(ps_composite, "", 1); //$NON-NLS-1$
// PROPERTY SHEET VIEWER
ps = new SystemPropertySheetForm(shell, ps_composite, SWT.BORDER, getMessageLine());
}
@@ -359,7 +359,7 @@ public class SystemSelectConnectionForm extends SystemBaseForm
//verbageLabel = SystemWidgetHelpers.createLabel(composite_prompts, verbage, gridColumns);
// SPACER LINE
- SystemWidgetHelpers.createLabel(composite_prompts, "", gridColumns);
+ SystemWidgetHelpers.createLabel(composite_prompts, "", gridColumns); //$NON-NLS-1$
// SELECT OBJECT READONLY TEXT FIELD
Composite nameComposite = composite_prompts;
@@ -464,7 +464,7 @@ public class SystemSelectConnectionForm extends SystemBaseForm
}
else
{
- setNameText("");
+ setNameText(""); //$NON-NLS-1$
setPageComplete(false);
}
}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/RSEDefaultNewConnectionWizardDelegate.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/RSEDefaultNewConnectionWizardDelegate.java
index 1e32887301a..24dee579a44 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/RSEDefaultNewConnectionWizardDelegate.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/RSEDefaultNewConnectionWizardDelegate.java
@@ -348,7 +348,7 @@ public class RSEDefaultNewConnectionWizardDelegate extends RSENewConnectionWizar
{
if (sysType.equals(IRSESystemType.SYSTEMTYPE_ISERIES))
{
- ISubSystem[] objSubSystems = sr.getSubSystemsBySubSystemConfigurationCategory("nativefiles", conn);
+ ISubSystem[] objSubSystems = sr.getSubSystemsBySubSystemConfigurationCategory("nativefiles", conn); //$NON-NLS-1$
if ((objSubSystems != null)
&& (objSubSystems.length>0))// might be in product that doesn't have iSeries plugins
sr.expandSubSystem(objSubSystems[0]);
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/RSENewConnectionWizardDefaultDelegateMainPage.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/RSENewConnectionWizardDefaultDelegateMainPage.java
index c57a9c8f585..a9d3420f88e 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/RSENewConnectionWizardDefaultDelegateMainPage.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/RSENewConnectionWizardDefaultDelegateMainPage.java
@@ -60,7 +60,7 @@ public class RSENewConnectionWizardDefaultDelegateMainPage
String description)
{
super(wizard, "NewConnection", title, description);
- parentHelpId = RSEUIPlugin.HELPPREFIX + "wncc0000";
+ parentHelpId = RSEUIPlugin.HELPPREFIX + "wncc0000"; //$NON-NLS-1$
setHelp(parentHelpId);
this.delegate = delegate;
form = getForm();
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/SystemNewConnectionWizard.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/SystemNewConnectionWizard.java
index 0c9eaaeff53..a3814a4e685 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/SystemNewConnectionWizard.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/SystemNewConnectionWizard.java
@@ -336,7 +336,7 @@ public class SystemNewConnectionWizard
{
if (sysType.equals(IRSESystemType.SYSTEMTYPE_ISERIES))
{
- ISubSystem[] objSubSystems = sr.getSubSystemsBySubSystemConfigurationCategory("nativefiles", conn);
+ ISubSystem[] objSubSystems = sr.getSubSystemsBySubSystemConfigurationCategory("nativefiles", conn); //$NON-NLS-1$
if ((objSubSystems != null)
&& (objSubSystems.length>0))// might be in product that doesn't have iSeries plugins
sr.expandSubSystem(objSubSystems[0]);
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/SystemNewConnectionWizardDefaultMainPage.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/SystemNewConnectionWizardDefaultMainPage.java
index 4dc9e4bc075..9de2948a97c 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/SystemNewConnectionWizardDefaultMainPage.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/SystemNewConnectionWizardDefaultMainPage.java
@@ -59,7 +59,7 @@ public class SystemNewConnectionWizardDefaultMainPage
String description)
{
super(wizard, "NewConnection", title, description);
- parentHelpId = RSEUIPlugin.HELPPREFIX + "wncc0000";
+ parentHelpId = RSEUIPlugin.HELPPREFIX + "wncc0000"; //$NON-NLS-1$
setHelp(parentHelpId);
form = getForm();
}
diff --git a/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/ISystemFilterReference.java b/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/ISystemFilterReference.java
index f31e25f05a4..ce0f108a03b 100644
--- a/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/ISystemFilterReference.java
+++ b/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/ISystemFilterReference.java
@@ -15,10 +15,10 @@
********************************************************************************/
package org.eclipse.rse.filters;
+import org.eclipse.rse.core.model.ISystemContainer;
+import org.eclipse.rse.core.model.ISystemContentsType;
import org.eclipse.rse.core.references.IRSEReferencingObject;
import org.eclipse.rse.core.subsystems.ISubSystem;
-import org.eclipse.rse.model.ISystemContainer;
-import org.eclipse.rse.model.ISystemContentsType;
/**
diff --git a/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/SystemFilterReference.java b/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/SystemFilterReference.java
index b8c7a0da4e3..a7527e2a323 100644
--- a/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/SystemFilterReference.java
+++ b/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/SystemFilterReference.java
@@ -20,14 +20,14 @@ import java.util.Iterator;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.Platform;
+import org.eclipse.rse.core.model.ISystemContainer;
+import org.eclipse.rse.core.model.ISystemContentsType;
import org.eclipse.rse.core.references.IRSEBaseReferencedObject;
import org.eclipse.rse.core.references.IRSEReferencingObject;
import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.internal.filters.SystemFilterContainerReferenceCommonMethods;
import org.eclipse.rse.internal.filters.SystemFilterStringReference;
import org.eclipse.rse.internal.references.SystemReferencingObject;
-import org.eclipse.rse.model.ISystemContainer;
-import org.eclipse.rse.model.ISystemContentsType;
diff --git a/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/SystemFilterSimple.java b/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/SystemFilterSimple.java
index b3cdc603e50..a7f292ebf55 100644
--- a/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/SystemFilterSimple.java
+++ b/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/SystemFilterSimple.java
@@ -19,9 +19,9 @@ import java.util.HashMap;
import java.util.Vector;
import org.eclipse.core.resources.IFile;
+import org.eclipse.rse.core.model.ISystemContainer;
+import org.eclipse.rse.core.model.ISystemContentsType;
import org.eclipse.rse.internal.filters.SystemFilter;
-import org.eclipse.rse.model.ISystemContainer;
-import org.eclipse.rse.model.ISystemContentsType;
/**
@@ -455,14 +455,14 @@ public class SystemFilterSimple extends SystemFilter implements ISystemContainer
}
/**
- * @see org.eclipse.rse.model.ISystemContainer#getContents(org.eclipse.rse.model.ISystemContentsType)
+ * @see org.eclipse.rse.core.model.ISystemContainer#getContents(org.eclipse.rse.core.model.ISystemContentsType)
*/
public Object[] getContents(ISystemContentsType contentsType) {
return (Object[])cachedContents.get(contentsType);
}
/**
- * @see org.eclipse.rse.model.ISystemContainer#hasContents(org.eclipse.rse.model.ISystemContentsType)
+ * @see org.eclipse.rse.core.model.ISystemContainer#hasContents(org.eclipse.rse.core.model.ISystemContentsType)
*/
public boolean hasContents(ISystemContentsType contentsType) {
@@ -474,14 +474,14 @@ public class SystemFilterSimple extends SystemFilter implements ISystemContainer
}
/**
- * @see org.eclipse.rse.model.ISystemContainer#isStale()
+ * @see org.eclipse.rse.core.model.ISystemContainer#isStale()
*/
public boolean isStale() {
return isStale;
}
/**
- * @see org.eclipse.rse.model.ISystemContainer#markStale(boolean)
+ * @see org.eclipse.rse.core.model.ISystemContainer#markStale(boolean)
*/
public void markStale(boolean isStale)
{
@@ -489,7 +489,7 @@ public class SystemFilterSimple extends SystemFilter implements ISystemContainer
}
/**
- * @see org.eclipse.rse.model.ISystemContainer#markStale(boolean)
+ * @see org.eclipse.rse.core.model.ISystemContainer#markStale(boolean)
*/
public void markStale(boolean isStale, boolean clearCache)
{
diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/Host.java b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/Host.java
index 7caa3c56d09..56e1afe02f2 100644
--- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/Host.java
+++ b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/Host.java
@@ -175,7 +175,6 @@ public class Host extends RSEModelObject implements IHost, IAdaptable
/**
* Return all the connector services provided for this host
- * @return
*/
public IConnectorService[] getConnectorServices()
{
@@ -296,7 +295,7 @@ public class Host extends RSEModelObject implements IHost, IAdaptable
boolean caseSensitiveUID = systemType.equals(IRSESystemType.SYSTEMTYPE_UNIX)
|| systemType.equals(IRSESystemType.SYSTEMTYPE_LINUX)
|| (systemType.equals(IRSESystemType.SYSTEMTYPE_LOCAL) &&
- !System.getProperty("os.name").toLowerCase().startsWith("windows"));
+ !System.getProperty("os.name").toLowerCase().startsWith("windows")); //$NON-NLS-1$ //$NON-NLS-2$
setForceUserIdToUpperCase(forceUC);
setUserIdCaseSensitive(caseSensitiveUID);
}
@@ -432,7 +431,7 @@ public class Host extends RSEModelObject implements IHost, IAdaptable
*/
protected String getPreferencesKey(String profileName, String connectionName)
{
- return profileName + "." + connectionName;
+ return profileName + "." + connectionName; //$NON-NLS-1$
}
@@ -471,9 +470,9 @@ public class Host extends RSEModelObject implements IHost, IAdaptable
public boolean compareUserIds(String userId1, String userId2)
{
if (userId1 == null)
- userId1 = "";
+ userId1 = ""; //$NON-NLS-1$
if (userId2 == null)
- userId2 = "";
+ userId2 = ""; //$NON-NLS-1$
if (userIdCaseSensitive)
return userId1.equals(userId2);
else
@@ -628,26 +627,24 @@ public class Host extends RSEModelObject implements IHost, IAdaptable
}
/**
- * @generated This field/method will be replaced during code generation.
+ * @deprecated This field/method will be replaced during code generation.
*/
public String toStringGen()
{
-
-
StringBuffer result = new StringBuffer(super.toString());
- result.append(" (systemType: ");
+ result.append(" (systemType: "); //$NON-NLS-1$
result.append(systemType);
- result.append(", aliasName: ");
+ result.append(", aliasName: "); //$NON-NLS-1$
result.append(aliasName);
- result.append(", hostName: ");
+ result.append(", hostName: "); //$NON-NLS-1$
result.append(hostName);
- result.append(", description: ");
+ result.append(", description: "); //$NON-NLS-1$
result.append(description);
- result.append(", defaultUserId: ");
+ result.append(", defaultUserId: "); //$NON-NLS-1$
result.append(defaultUserId);
- result.append(", promptable: ");
+ result.append(", promptable: "); //$NON-NLS-1$
result.append(promptable);
- result.append(", offline: ");
+ result.append(", offline: "); //$NON-NLS-1$
result.append(offline);
result.append(')');
return result.toString();
diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemHostPool.java b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemHostPool.java
index 9fd643d3714..5a2511e0a6a 100644
--- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemHostPool.java
+++ b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemHostPool.java
@@ -43,7 +43,7 @@ public class SystemHostPool extends RSEModelObject implements ISystemHostPool
protected static final String NAME_EDEFAULT = null;
private static Hashtable pools = null;
- private static String CONNECTION_FILE_NAME = "connection";
+ private static String CONNECTION_FILE_NAME = "connection"; //$NON-NLS-1$
protected String name = NAME_EDEFAULT;
@@ -118,6 +118,7 @@ public class SystemHostPool extends RSEModelObject implements ISystemHostPool
/**
* Private debug method to print connections, to test restored ok.
+ * @deprecated
*/
public void printConnections()
{
@@ -126,18 +127,18 @@ public class SystemHostPool extends RSEModelObject implements ISystemHostPool
if (!connsList.hasNext())
{
System.out.println();
- System.out.println("No connections");
+ System.out.println("No connections"); //$NON-NLS-1$
}
while (connsList.hasNext())
{
System.out.println();
IHost conn = (IHost)connsList.next();
- System.out.println(" AliasName.....: " + conn.getAliasName());
- System.out.println(" -----------------------------------------------------");
- System.out.println(" HostName......: " + conn.getHostName());
- System.out.println(" SystemType....: " + conn.getSystemType());
- System.out.println(" Description...: " + conn.getDescription());
- System.out.println(" UserId........: " + conn.getDefaultUserId());
+ System.out.println(" AliasName.....: " + conn.getAliasName()); //$NON-NLS-1$
+ System.out.println(" -----------------------------------------------------"); //$NON-NLS-1$
+ System.out.println(" HostName......: " + conn.getHostName()); //$NON-NLS-1$
+ System.out.println(" SystemType....: " + conn.getSystemType()); //$NON-NLS-1$
+ System.out.println(" Description...: " + conn.getDescription()); //$NON-NLS-1$
+ System.out.println(" UserId........: " + conn.getDefaultUserId()); //$NON-NLS-1$
}
}
@@ -417,7 +418,7 @@ public class SystemHostPool extends RSEModelObject implements ISystemHostPool
* Duplicates a given connection in this list within this list or another list.
* @param targetPool The SystemConnectionPool to hold the copied connection. Can equal this connection, as long as alias name is unique
* @param conn SystemConnection object (within our pool) to clone
- * @param alias New, unique, alias name to give this connection. Clone will fail if this is not unique.
+ * @param aliasName New, unique, alias name to give this connection. Clone will fail if this is not unique.
*/
public IHost cloneHost(ISystemHostPool targetPool, IHost conn, String aliasName)
throws Exception
@@ -624,14 +625,12 @@ public class SystemHostPool extends RSEModelObject implements ISystemHostPool
}
/**
- * @generated This field/method will be replaced during code generation.
+ * @deprecated This field/method will be replaced during code generation.
*/
public String toStringGen()
{
-
-
StringBuffer result = new StringBuffer(super.toString());
- result.append(" (name: ");
+ result.append(" (name: "); //$NON-NLS-1$
result.append(name);
result.append(')');
return result.toString();
diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemModelChangeEvent.java b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemModelChangeEvent.java
index 0a2c1a72382..e751e26ec34 100644
--- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemModelChangeEvent.java
+++ b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemModelChangeEvent.java
@@ -16,8 +16,8 @@
package org.eclipse.rse.internal.model;
-import org.eclipse.rse.model.ISystemModelChangeEvent;
-import org.eclipse.rse.model.ISystemModelChangeEvents;
+import org.eclipse.rse.core.model.ISystemModelChangeEvent;
+import org.eclipse.rse.core.model.ISystemModelChangeEvents;
/**
* For listeners interested in model changes with resources in the rse project.
@@ -85,16 +85,16 @@ public class SystemModelChangeEvent implements ISystemModelChangeEvent, ISystemM
}
/**
- * Get the event type, such as {@link org.eclipse.rse.model.ISystemModelChangeEvents#SYSTEM_RESOURCE_ADDED}.
- * @see org.eclipse.rse.model.ISystemModelChangeEvents
+ * Get the event type, such as {@link org.eclipse.rse.core.model.ISystemModelChangeEvents#SYSTEM_RESOURCE_ADDED}.
+ * @see org.eclipse.rse.core.model.ISystemModelChangeEvents
*/
public int getEventType()
{
return eventType;
}
/**
- * Get the resource type, such as {@link org.eclipse.rse.model.ISystemModelChangeEvents#SYSTEM_RESOURCETYPE_CONNECTION}.
- * @see org.eclipse.rse.model.ISystemModelChangeEvents
+ * Get the resource type, such as {@link org.eclipse.rse.core.model.ISystemModelChangeEvents#SYSTEM_RESOURCETYPE_CONNECTION}.
+ * @see org.eclipse.rse.core.model.ISystemModelChangeEvents
*/
public int getResourceType()
{
diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemModelChangeEventManager.java b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemModelChangeEventManager.java
index b986cd96f4b..bdac23e4077 100644
--- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemModelChangeEventManager.java
+++ b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemModelChangeEventManager.java
@@ -17,8 +17,8 @@
package org.eclipse.rse.internal.model;
import java.util.Vector;
-import org.eclipse.rse.model.ISystemModelChangeEvent;
-import org.eclipse.rse.model.ISystemModelChangeListener;
+import org.eclipse.rse.core.model.ISystemModelChangeEvent;
+import org.eclipse.rse.core.model.ISystemModelChangeListener;
/**
diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemNewConnectionPromptObject.java b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemNewConnectionPromptObject.java
index a58e4770225..78d8e66b9fd 100644
--- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemNewConnectionPromptObject.java
+++ b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemNewConnectionPromptObject.java
@@ -20,10 +20,10 @@ import org.eclipse.core.runtime.Platform;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.rse.core.IRSESystemType;
import org.eclipse.rse.core.RSECorePlugin;
+import org.eclipse.rse.core.model.ISystemMessageObject;
+import org.eclipse.rse.core.model.SystemMessageObject;
import org.eclipse.rse.model.IHost;
-import org.eclipse.rse.model.ISystemMessageObject;
import org.eclipse.rse.model.ISystemPromptableObject;
-import org.eclipse.rse.model.SystemMessageObject;
import org.eclipse.rse.ui.ISystemIconConstants;
import org.eclipse.rse.ui.ISystemMessages;
import org.eclipse.rse.ui.RSESystemTypeAdapter;
diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemPreferenceChangeEvent.java b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemPreferenceChangeEvent.java
index a788d662bf6..cf77db246db 100644
--- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemPreferenceChangeEvent.java
+++ b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemPreferenceChangeEvent.java
@@ -17,13 +17,13 @@
package org.eclipse.rse.internal.model;
import java.util.EventObject;
-import org.eclipse.rse.model.ISystemPreferenceChangeEvent;
+import org.eclipse.rse.core.model.ISystemPreferenceChangeEvent;
/**
* Event object sent to ISystemPreferenceChangeListeners when a
* remote system preference is changed.
- * @see org.eclipse.rse.model.ISystemPreferenceChangeEvents
+ * @see org.eclipse.rse.core.model.ISystemPreferenceChangeEvents
*/
public class SystemPreferenceChangeEvent
extends EventObject
@@ -35,7 +35,7 @@ public class SystemPreferenceChangeEvent
/**
* Constructor
- * @see org.eclipse.rse.model.ISystemPreferenceChangeEvents
+ * @see org.eclipse.rse.core.model.ISystemPreferenceChangeEvents
* @param source The object that was added,deleted,renamed,changed.
* @param type The type of event, one of ISystemChangeEvent constants.
* @param parent The parent of the object that was added or deleted.
@@ -50,7 +50,7 @@ public class SystemPreferenceChangeEvent
/**
* Return the type of the event
- * @see org.eclipse.rse.model.ISystemPreferenceChangeEvents
+ * @see org.eclipse.rse.core.model.ISystemPreferenceChangeEvents
*/
public int getType()
{
@@ -73,7 +73,7 @@ public class SystemPreferenceChangeEvent
/**
* Set the type
- * @see org.eclipse.rse.model.ISystemPreferenceChangeEvents
+ * @see org.eclipse.rse.core.model.ISystemPreferenceChangeEvents
*/
public void setType(int type)
{
diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemPreferenceChangeManager.java b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemPreferenceChangeManager.java
index fcaef7db6a5..a039f48f5d8 100644
--- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemPreferenceChangeManager.java
+++ b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemPreferenceChangeManager.java
@@ -17,8 +17,8 @@
package org.eclipse.rse.internal.model;
import java.util.Vector;
-import org.eclipse.rse.model.ISystemPreferenceChangeEvent;
-import org.eclipse.rse.model.ISystemPreferenceChangeListener;
+import org.eclipse.rse.core.model.ISystemPreferenceChangeEvent;
+import org.eclipse.rse.core.model.ISystemPreferenceChangeListener;
/**
diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemProfile.java b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemProfile.java
index 5b001c0cd0d..9efbc943ccc 100644
--- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemProfile.java
+++ b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemProfile.java
@@ -67,7 +67,7 @@ public class SystemProfile extends RSEModelObject implements ISystemProfile, IAd
/**
* Convenience method for create a new connection within this profile.
- * Shortcut for {@link ISystemRegistry#createHost(String,String,String,String)}
+ * Shortcut for {@link org.eclipse.rse.model.ISystemRegistry#createHost(String,String,String,String)}
*/
public IHost createHost(String systemType, String connectionName, String hostName, String description) throws Exception
{
@@ -138,14 +138,14 @@ public class SystemProfile extends RSEModelObject implements ISystemProfile, IAd
return Platform.getAdapterManager().getAdapter(this, adapterType);
}
-
+ //For debugging
public String toString() {
String result = getName();
if (result == null) {
StringBuffer buf = new StringBuffer(super.toString());
- buf.append("Profile(name: ");
+ buf.append("Profile(name: "); //$NON-NLS-1$
buf.append(name);
- buf.append(", defaultPrivate: ");
+ buf.append(", defaultPrivate: "); //$NON-NLS-1$
buf.append(defaultPrivate);
buf.append(')');
result = buf.toString();
diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemProfileManager.java b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemProfileManager.java
index 0e263e736c8..06b7ce763fc 100644
--- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemProfileManager.java
+++ b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemProfileManager.java
@@ -40,7 +40,7 @@ public class SystemProfileManager implements ISystemProfileManager
private String[] profileNames = null;
private Vector profileNamesVector = null;
private static ISystemProfileManager singleton = null;
- private static final String PROFILE_FILE_NAME = "profile";
+ private static final String PROFILE_FILE_NAME = "profile"; //$NON-NLS-1$
/**
* Default constructor
@@ -74,7 +74,7 @@ public class SystemProfileManager implements ISystemProfileManager
}
}
if (name == null) {
- name = System.getProperty("user.name");
+ name = System.getProperty("user.name"); //$NON-NLS-1$
}
return name;
}
@@ -215,7 +215,7 @@ public class SystemProfileManager implements ISystemProfileManager
if (!defaultProfileExist)
{
// If Team is the only profile - then put a message in the log - do not make Team to be default
- if (profiles.size() == 1 && ((ISystemProfile)profiles.get(0)).getName().equalsIgnoreCase("Team"))
+ if (profiles.size() == 1 && ((ISystemProfile)profiles.get(0)).getName().equalsIgnoreCase("Team")) //$NON-NLS-1$
{
SystemBasePlugin.logWarning("Only one Profile Team exists - there is no Default Profile");
}
@@ -599,7 +599,7 @@ public class SystemProfileManager implements ISystemProfileManager
/**
* Reusable method to return a name validator for renaming a profile.
- * @param the current profile name on updates. Can be null for new profiles. Used
+ * @param profileName the current profile name on updates. Can be null for new profiles. Used
* to remove from the existing name list the current connection.
*/
public ISystemValidator getProfileNameValidator(String profileName)
@@ -613,7 +613,7 @@ public class SystemProfileManager implements ISystemProfileManager
}
/**
* Reusable method to return a name validator for renaming a profile.
- * @param the current profile object on updates. Can be null for new profiles. Used
+ * @param profile the current profile object on updates. Can be null for new profiles. Used
* to remove from the existing name list the current connection.
*/
public ISystemValidator getProfileNameValidator(ISystemProfile profile)
diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemRegistry.java b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemRegistry.java
index b79453797be..b1409c51766 100644
--- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemRegistry.java
+++ b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemRegistry.java
@@ -34,6 +34,14 @@ import org.eclipse.rse.core.SystemAdapterHelpers;
import org.eclipse.rse.core.SystemBasePlugin;
import org.eclipse.rse.core.SystemPerspectiveHelpers;
import org.eclipse.rse.core.SystemPreferencesManager;
+import org.eclipse.rse.core.model.ISubSystemConfigurationCategories;
+import org.eclipse.rse.core.model.ISystemContainer;
+import org.eclipse.rse.core.model.ISystemModelChangeEvent;
+import org.eclipse.rse.core.model.ISystemModelChangeEvents;
+import org.eclipse.rse.core.model.ISystemModelChangeListener;
+import org.eclipse.rse.core.model.ISystemPreferenceChangeEvent;
+import org.eclipse.rse.core.model.ISystemPreferenceChangeListener;
+import org.eclipse.rse.core.model.SystemChildrenContentsType;
import org.eclipse.rse.core.references.IRSEBaseReferencingObject;
import org.eclipse.rse.core.servicesubsystem.IServiceSubSystem;
import org.eclipse.rse.core.servicesubsystem.IServiceSubSystemConfiguration;
@@ -46,13 +54,7 @@ import org.eclipse.rse.filters.ISystemFilter;
import org.eclipse.rse.filters.ISystemFilterPoolReferenceManager;
import org.eclipse.rse.filters.ISystemFilterReference;
import org.eclipse.rse.model.IHost;
-import org.eclipse.rse.model.ISystemContainer;
import org.eclipse.rse.model.ISystemHostPool;
-import org.eclipse.rse.model.ISystemModelChangeEvent;
-import org.eclipse.rse.model.ISystemModelChangeEvents;
-import org.eclipse.rse.model.ISystemModelChangeListener;
-import org.eclipse.rse.model.ISystemPreferenceChangeEvent;
-import org.eclipse.rse.model.ISystemPreferenceChangeListener;
import org.eclipse.rse.model.ISystemProfile;
import org.eclipse.rse.model.ISystemProfileManager;
import org.eclipse.rse.model.ISystemRegistry;
@@ -61,7 +63,6 @@ import org.eclipse.rse.model.ISystemRemoteChangeListener;
import org.eclipse.rse.model.ISystemResourceChangeEvent;
import org.eclipse.rse.model.ISystemResourceChangeEvents;
import org.eclipse.rse.model.ISystemResourceChangeListener;
-import org.eclipse.rse.model.SystemChildrenContentsType;
import org.eclipse.rse.model.SystemRemoteChangeEvent;
import org.eclipse.rse.model.SystemResourceChangeEvent;
import org.eclipse.rse.services.clientserver.messages.SystemMessage;
@@ -1444,7 +1445,7 @@ public class SystemRegistry implements ISystemRegistry, ISystemModelChangeEvents
* This looks for a match on the "category" of the subsystem factory's xml declaration
* in its plugin.xml file.
*
- * @see org.eclipse.rse.model.ISubSystemConfigurationCategories
+ * @see org.eclipse.rse.core.model.ISubSystemConfigurationCategories
*/
public ISubSystem[] getSubSystemsBySubSystemConfigurationCategory(String factoryCategory, IHost connection)
{
@@ -1700,7 +1701,7 @@ public class SystemRegistry implements ISystemRegistry, ISystemModelChangeEvents
* in its plugin.xml file. Thus, it is effecient as it need not bring to live a
* subsystem factory just to test its parent class type.
*
- * @see ISubSystemConfigurationCategories
+ * @see org.eclipse.rse.core.model.ISubSystemConfigurationCategories
*/
public IHost[] getHostsBySubSystemConfigurationCategory(String factoryCategory)
{
@@ -1904,7 +1905,7 @@ public class SystemRegistry implements ISystemRegistry, ISystemModelChangeEvents
}
}
if ((systemType != null) && (systemType.equals(IRSESystemType.SYSTEMTYPE_LOCAL) && (v.size() == 0)))
- v.addElement("localhost");
+ v.addElement("localhost"); //$NON-NLS-1$
String[] names = new String[v.size()];
for (int idx = 0; idx < names.length; idx++)
names[idx] = (String) v.elementAt(idx);
@@ -1944,8 +1945,8 @@ public class SystemRegistry implements ISystemRegistry, ISystemModelChangeEvents
private Object getObjectFor(String str)
{
// first extract subsystem id
- int connectionDelim = str.indexOf(":");
- int subsystemDelim = str.indexOf(":", connectionDelim + 1);
+ int connectionDelim = str.indexOf(":"); //$NON-NLS-1$
+ int subsystemDelim = str.indexOf(":", connectionDelim + 1); //$NON-NLS-1$
String subSystemId = str.substring(0, subsystemDelim);
String srcKey = str.substring(subsystemDelim + 1, str.length());
@@ -2004,7 +2005,7 @@ public class SystemRegistry implements ISystemRegistry, ISystemModelChangeEvents
byte[] result = data.getData();
//StringTokenizer tokenizer = new StringTokenizer(new String(result), SystemViewDataDropAdapter.RESOURCE_SEPARATOR);
- String[] tokens = (new String(result)).split("\\"+SystemViewDataDropAdapter.RESOURCE_SEPARATOR);
+ String[] tokens = (new String(result)).split("\\"+SystemViewDataDropAdapter.RESOURCE_SEPARATOR); //$NON-NLS-1$
for (int i = 0;i < tokens.length; i++)
{
@@ -2035,15 +2036,12 @@ public class SystemRegistry implements ISystemRegistry, ISystemModelChangeEvents
// Local File transfer
FileTransfer fileTransfer = FileTransfer.getInstance();
object = clipboard.getContents(fileTransfer);
- if (object != null)
+ if (object instanceof String[])
{
String[] fileData = (String[]) object;
- if (fileData != null)
+ for (int i = 0; i < fileData.length; i++)
{
- for (int i = 0; i < fileData.length; i++)
- {
- srcObjects.add(fileData[i]);
- }
+ srcObjects.add(fileData[i]);
}
}
}
@@ -2051,13 +2049,10 @@ public class SystemRegistry implements ISystemRegistry, ISystemModelChangeEvents
{
TextTransfer textTransfer = TextTransfer.getInstance();
object = clipboard.getContents(textTransfer);
- if (object != null)
+ if (object instanceof String)
{
String textData = (String) object;
- if (textData != null)
- {
- srcObjects.add(textData);
- }
+ srcObjects.add(textData);
}
}
return srcObjects;
@@ -2097,8 +2092,8 @@ public class SystemRegistry implements ISystemRegistry, ISystemModelChangeEvents
localConn = createHost(
profile.getName(), IRSESystemType.SYSTEMTYPE_LOCAL,
name, // connection name
- "localhost", // hostname
- "", // description
+ "localhost", // hostname //$NON-NLS-1$
+ "", // description //$NON-NLS-1$
// DY: defect 42101, description cannot be null
// null, // description
userId, // default user Id
@@ -2668,7 +2663,7 @@ public class SystemRegistry implements ISystemRegistry, ISystemModelChangeEvents
}
catch (InterruptedException exc)
{
- System.out.println("Cacnelled");
+ System.out.println("Cancelled");
cancelled = true;
}
catch (Exception exc)
diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/ISystemHostPool.java b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/ISystemHostPool.java
index 606df79d431..3b486e6f896 100644
--- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/ISystemHostPool.java
+++ b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/ISystemHostPool.java
@@ -133,7 +133,7 @@ public interface ISystemHostPool extends IRSEPersistableContainer
* Duplicates a given connection in this list within this list or another list.
* @param targetPool The SystemConnectionPool to hold the copied connection. Can equal this connection, as long as alias name is unique
* @param conn SystemConnection object (within our pool) to clone
- * @param alias New, unique, alias name to give this connection. Clone will fail if this is not unique.
+ * @param aliasName New, unique, alias name to give this connection. Clone will fail if this is not unique.
*/
public IHost cloneHost(ISystemHostPool targetPool, IHost conn, String aliasName)
throws Exception;
diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/ISystemProfileManager.java b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/ISystemProfileManager.java
index b4bb713207e..77c3d2cd48f 100644
--- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/ISystemProfileManager.java
+++ b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/ISystemProfileManager.java
@@ -103,13 +103,13 @@ public interface ISystemProfileManager {
/**
* Reusable method to return a name validator for renaming a profile.
- * @param the current profile name on updates. Can be null for new profiles. Used
+ * @param profileName the current profile name on updates. Can be null for new profiles. Used
* to remove from the existing name list the current connection.
*/
public ISystemValidator getProfileNameValidator(String profileName);
/**
* Reusable method to return a name validator for renaming a profile.
- * @param the current profile object on updates. Can be null for new profiles. Used
+ * @param profile the current profile object on updates. Can be null for new profiles. Used
* to remove from the existing name list the current connection.
*/
public ISystemValidator getProfileNameValidator(ISystemProfile profile);
diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/ISystemRegistry.java b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/ISystemRegistry.java
index 0a0c5d2bee1..36a1a61326e 100644
--- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/ISystemRegistry.java
+++ b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/ISystemRegistry.java
@@ -23,6 +23,11 @@ import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.jobs.ISchedulingRule;
import org.eclipse.jface.operation.IRunnableContext;
import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.rse.core.model.ISubSystemConfigurationCategories;
+import org.eclipse.rse.core.model.ISystemModelChangeEvent;
+import org.eclipse.rse.core.model.ISystemModelChangeListener;
+import org.eclipse.rse.core.model.ISystemPreferenceChangeEvent;
+import org.eclipse.rse.core.model.ISystemPreferenceChangeListener;
import org.eclipse.rse.core.subsystems.IConnectorService;
import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
@@ -283,14 +288,14 @@ public interface ISystemRegistry extends ISystemViewInputProvider, ISchedulingRu
/**
* Return the absolute name for the specified subsystem
- * @param the subsystem
+ * @param subsystem the subsystem
* @return the absolute name of the subsystem
*/
public String getAbsoluteNameForSubSystem(ISubSystem subsystem);
/**
* Return the absolute name for the specified connection
- * @param the connection
+ * @param connection the connection
* @return the absolute name of the connection
*/
public String getAbsoluteNameForConnection(IHost connection);
@@ -314,7 +319,7 @@ public interface ISystemRegistry extends ISystemViewInputProvider, ISchedulingRu
* This looks for a match on the "category" of the subsystem factory's xml declaration
* in its plugin.xml file.
*
- * @see org.eclipse.rse.model.ISubSystemConfigurationCategories
+ * @see org.eclipse.rse.core.model.ISubSystemConfigurationCategories
*/
public ISubSystem[] getSubSystemsBySubSystemConfigurationCategory(String factoryCategory, IHost connection);
@@ -368,7 +373,7 @@ public interface ISystemRegistry extends ISystemViewInputProvider, ISchedulingRu
* in its plugin.xml file. Thus, it is effecient as it need not bring to life a
* subsystem factory just to test its parent class type.
*
- * @see org.eclipse.rse.model.ISubSystemConfigurationCategories
+ * @see org.eclipse.rse.core.model.ISubSystemConfigurationCategories
*/
public IHost[] getHostsBySubSystemConfigurationCategory(String factoryCategory);
/**
diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/ISystemResourceChangeEvent.java b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/ISystemResourceChangeEvent.java
index 5a6d3492a7d..a9172b1458b 100644
--- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/ISystemResourceChangeEvent.java
+++ b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/ISystemResourceChangeEvent.java
@@ -21,7 +21,7 @@ import org.eclipse.swt.widgets.Item;
/**
* Interface of event sent when a remote system resource changes.
* These events are mainly for internal use. BPs/ISVs should instead
- * fire and monitor for {@link org.eclipse.rse.model.ISystemModelChangeEvent}.
+ * fire and monitor for {@link org.eclipse.rse.core.model.ISystemModelChangeEvent}.
* @see org.eclipse.rse.model.ISystemResourceChangeEvents
*/
public interface ISystemResourceChangeEvent extends ISystemResourceChangeEvents
diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/SystemEscapeCharHelper.java b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/SystemEscapeCharHelper.java
index 229b4dafec0..a75b7f45f8a 100644
--- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/SystemEscapeCharHelper.java
+++ b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/SystemEscapeCharHelper.java
@@ -111,12 +111,12 @@ public class SystemEscapeCharHelper {
*/
int intValue = c;
- String returnStr=""+ESCAPE_CHAR;
+ String returnStr=""+ESCAPE_CHAR; //$NON-NLS-1$
if (intValue < 10)
- returnStr = returnStr+"00";
+ returnStr = returnStr+"00"; //$NON-NLS-1$
else if (intValue < 100)
- returnStr = returnStr+"0";
+ returnStr = returnStr+"0"; //$NON-NLS-1$
return returnStr + intValue;
@@ -128,7 +128,7 @@ public class SystemEscapeCharHelper {
char c = (char)Integer.parseInt(s);
- return ""+c;
+ return ""+c; //$NON-NLS-1$
}
diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/SystemRemoteElementResourceSet.java b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/SystemRemoteElementResourceSet.java
index b3753dc92e8..69807ea17f7 100644
--- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/SystemRemoteElementResourceSet.java
+++ b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/SystemRemoteElementResourceSet.java
@@ -19,6 +19,7 @@ package org.eclipse.rse.model;
import java.util.List;
import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.rse.core.model.AbstractSystemResourceSet;
import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.ui.view.ISystemViewElementAdapter;
diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/SystemRemoteResourceSet.java b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/SystemRemoteResourceSet.java
index e63eb74d980..3cff4f66fd6 100644
--- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/SystemRemoteResourceSet.java
+++ b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/SystemRemoteResourceSet.java
@@ -18,6 +18,7 @@ package org.eclipse.rse.model;
import java.util.List;
import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.rse.core.model.AbstractSystemResourceSet;
import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.ui.view.ISystemDragDropAdapter;
diff --git a/rse/plugins/org.eclipse.rse.ui/persistence/org/eclipse/rse/internal/persistence/PropertyFileProvider.java b/rse/plugins/org.eclipse.rse.ui/persistence/org/eclipse/rse/internal/persistence/PropertyFileProvider.java
index 34c513d1d13..5e9232fe438 100644
--- a/rse/plugins/org.eclipse.rse.ui/persistence/org/eclipse/rse/internal/persistence/PropertyFileProvider.java
+++ b/rse/plugins/org.eclipse.rse.ui/persistence/org/eclipse/rse/internal/persistence/PropertyFileProvider.java
@@ -53,31 +53,31 @@ import org.eclipse.rse.persistence.dom.RSEDOMNodeAttribute;
*/
public class PropertyFileProvider implements IRSEPersistenceProvider {
- private static final String NULL_VALUE_STRING = "null";
- private static final String PROPERTIES_FILE_NAME = "node.properties";
+ private static final String NULL_VALUE_STRING = "null"; //$NON-NLS-1$
+ private static final String PROPERTIES_FILE_NAME = "node.properties"; //$NON-NLS-1$
/* Metatype names */
- private static final String MT_ATTRIBUTE_TYPE = "attr-type";
- private static final String MT_ATTRIBUTE = "attr";
- private static final String MT_CHILD = "child";
- private static final String MT_NODE_TYPE = "n-type";
- private static final String MT_NODE_NAME = "n-name";
- private static final String MT_REFERENCE = "ref";
+ private static final String MT_ATTRIBUTE_TYPE = "attr-type"; //$NON-NLS-1$
+ private static final String MT_ATTRIBUTE = "attr"; //$NON-NLS-1$
+ private static final String MT_CHILD = "child"; //$NON-NLS-1$
+ private static final String MT_NODE_TYPE = "n-type"; //$NON-NLS-1$
+ private static final String MT_NODE_NAME = "n-name"; //$NON-NLS-1$
+ private static final String MT_REFERENCE = "ref"; //$NON-NLS-1$
/* Type abbreviations */
- private static final String AB_SUBSYSTEM = "SS";
- private static final String AB_SERVICE_LAUNCHER = "SL";
- private static final String AB_PROPERTY_SET = "PS";
- private static final String AB_PROPERTY = "P";
- private static final String AB_HOST = "H";
- private static final String AB_FILTER_STRING = "FS";
- private static final String AB_FILTER_POOL_REFERENCE = "FPR";
- private static final String AB_FILTER_POOL = "FP";
- private static final String AB_FILTER = "F";
- private static final String AB_CONNECTOR_SERVICE = "CS";
- private static final String AB_PROFILE = "PRF";
+ private static final String AB_SUBSYSTEM = "SS"; //$NON-NLS-1$
+ private static final String AB_SERVICE_LAUNCHER = "SL"; //$NON-NLS-1$
+ private static final String AB_PROPERTY_SET = "PS"; //$NON-NLS-1$
+ private static final String AB_PROPERTY = "P"; //$NON-NLS-1$
+ private static final String AB_HOST = "H"; //$NON-NLS-1$
+ private static final String AB_FILTER_STRING = "FS"; //$NON-NLS-1$
+ private static final String AB_FILTER_POOL_REFERENCE = "FPR"; //$NON-NLS-1$
+ private static final String AB_FILTER_POOL = "FP"; //$NON-NLS-1$
+ private static final String AB_FILTER = "F"; //$NON-NLS-1$
+ private static final String AB_CONNECTOR_SERVICE = "CS"; //$NON-NLS-1$
+ private static final String AB_PROFILE = "PRF"; //$NON-NLS-1$
- private Pattern period = Pattern.compile("\\.");
+ private Pattern period = Pattern.compile("\\."); //$NON-NLS-1$
private Map typeQualifiers = getTypeQualifiers();
/* (non-Javadoc)
@@ -185,8 +185,8 @@ public class PropertyFileProvider implements IRSEPersistenceProvider {
}
}
- private static final String VALID = "abcdefghijklmnopqrstuvwxyz0123456789-._";
- private static final String UPPER = "ABCDEFGHIJKLMNOPQRTSUVWXYZ";
+ private static final String VALID = "abcdefghijklmnopqrstuvwxyz0123456789-._"; //$NON-NLS-1$
+ private static final String UPPER = "ABCDEFGHIJKLMNOPQRTSUVWXYZ"; //$NON-NLS-1$
/**
* Returns the name of a folder that can be used to store a node of a particular
* type. Since this is a folder, its name must conform to the rules of the file
@@ -224,7 +224,7 @@ public class PropertyFileProvider implements IRSEPersistenceProvider {
buf.append('#');
}
}
- name = buf.toString() + "_" + Long.toString(suffix);
+ name = buf.toString() + "_" + Long.toString(suffix); //$NON-NLS-1$
String result = combine(type, name);
return result;
}
@@ -256,14 +256,14 @@ public class PropertyFileProvider implements IRSEPersistenceProvider {
// System.out.println("writing "+file.getFullPath()+"...");
ByteArrayOutputStream outStream = new ByteArrayOutputStream(500);
PrintWriter out = new PrintWriter(outStream);
- out.println("# " + header);
+ out.println("# " + header); //$NON-NLS-1$
Map map = new TreeMap(properties);
Set keys = map.keySet();
for (Iterator z = keys.iterator(); z.hasNext();) {
String key = (String) z.next();
String value = (String)map.get(key);
- String keyvalue = key + "=" + escapeValue(value);
+ String keyvalue = key + "=" + escapeValue(value); //$NON-NLS-1$
// System.out.println("writing "+keyvalue);
out.println(keyvalue);
}
@@ -305,7 +305,7 @@ public class PropertyFileProvider implements IRSEPersistenceProvider {
*/
private String getIndexString(int i) {
if (i < 0 || i > 99999) throw new IllegalArgumentException("Argument must be between 0 and 99999");
- String index = "00000" + Integer.toString(i);
+ String index = "00000" + Integer.toString(i); //$NON-NLS-1$
index = index.substring(index.length() - 5);
return index;
}
@@ -333,21 +333,21 @@ public class PropertyFileProvider implements IRSEPersistenceProvider {
for (int i = 0; i < characters.length; i++) {
char c = characters[i];
if (c == '\\') {
- buffer.append("\\\\");
+ buffer.append("\\\\"); //$NON-NLS-1$
} else if (c == '\t') {
- buffer.append("\\t");
+ buffer.append("\\t"); //$NON-NLS-1$
} else if (c == '\f') {
- buffer.append("\\f");
+ buffer.append("\\f"); //$NON-NLS-1$
} else if (c == '\n') {
- buffer.append("\\n");
+ buffer.append("\\n"); //$NON-NLS-1$
} else if (c == '\r') {
- buffer.append("\\r");
+ buffer.append("\\r"); //$NON-NLS-1$
} else if ((c < '\u0020' && c > '\u007E')) {
- String cString = "0000" + Integer.toHexString(c);
+ String cString = "0000" + Integer.toHexString(c); //$NON-NLS-1$
cString = cString.substring(cString.length() - 4);
- cString = "\\u" + cString;
+ cString = "\\u" + cString; //$NON-NLS-1$
buffer.append(cString);
- } else if ("=!#:".indexOf(c) >= 0) {
+ } else if ("=!#:".indexOf(c) >= 0) { //$NON-NLS-1$
buffer.append('\\');
buffer.append(c);
} else {
@@ -629,7 +629,7 @@ public class PropertyFileProvider implements IRSEPersistenceProvider {
} catch (Exception e) {
}
//IFolder providerFolder = getFolder(project, "org.eclipse.rse.dom.properties");
- IFolder providerFolder = getFolder(project, "dom.properties");
+ IFolder providerFolder = getFolder(project, "dom.properties"); //$NON-NLS-1$
return providerFolder;
}
diff --git a/rse/plugins/org.eclipse.rse.ui/persistence/org/eclipse/rse/internal/persistence/RSEPersistenceManager.java b/rse/plugins/org.eclipse.rse.ui/persistence/org/eclipse/rse/internal/persistence/RSEPersistenceManager.java
index bf07c276657..40891a38c09 100644
--- a/rse/plugins/org.eclipse.rse.ui/persistence/org/eclipse/rse/internal/persistence/RSEPersistenceManager.java
+++ b/rse/plugins/org.eclipse.rse.ui/persistence/org/eclipse/rse/internal/persistence/RSEPersistenceManager.java
@@ -83,15 +83,15 @@ public class RSEPersistenceManager implements IRSEPersistenceManager {
IRSEPersistenceProvider provider = (IRSEPersistenceProvider) loadedProviders.get(id);
if (provider == null) {
IExtensionRegistry registry = Platform.getExtensionRegistry();
- IConfigurationElement[] providerCandidates = registry.getConfigurationElementsFor("org.eclipse.rse.ui", "persistenceProviders");
+ IConfigurationElement[] providerCandidates = registry.getConfigurationElementsFor("org.eclipse.rse.ui", "persistenceProviders"); //$NON-NLS-1$ //$NON-NLS-2$
for (int j = 0; j < providerCandidates.length; j++) {
IConfigurationElement providerCandidate = providerCandidates[j];
- if (providerCandidate.getName().equals("persistenceProvider")) {
- String candidateId = providerCandidate.getAttribute("id");
+ if (providerCandidate.getName().equals("persistenceProvider")) { //$NON-NLS-1$
+ String candidateId = providerCandidate.getAttribute("id"); //$NON-NLS-1$
if (candidateId != null) {
if (candidateId.equals(id)) {
try {
- provider = (IRSEPersistenceProvider) providerCandidate.createExecutableExtension("class");
+ provider = (IRSEPersistenceProvider) providerCandidate.createExecutableExtension("class"); //$NON-NLS-1$
} catch (CoreException e) {
logger.logError("Exception loading persistence provider", e); // DWD nls
}
@@ -116,7 +116,7 @@ public class RSEPersistenceManager implements IRSEPersistenceManager {
* TODO: need to determine what this is. Having more than one is problematic.
*/
public IRSEPersistenceProvider getRSEPersistenceProvider() {
- IRSEPersistenceProvider provider = getRSEPersistenceProvider("org.eclipse.rse.persistence.PropertyFileProvider");
+ IRSEPersistenceProvider provider = getRSEPersistenceProvider("org.eclipse.rse.persistence.PropertyFileProvider"); //$NON-NLS-1$
return provider;
}
diff --git a/rse/plugins/org.eclipse.rse.ui/persistence/org/eclipse/rse/internal/persistence/SerializingProvider.java b/rse/plugins/org.eclipse.rse.ui/persistence/org/eclipse/rse/internal/persistence/SerializingProvider.java
index ae43c90c55e..ebe0903b57e 100644
--- a/rse/plugins/org.eclipse.rse.ui/persistence/org/eclipse/rse/internal/persistence/SerializingProvider.java
+++ b/rse/plugins/org.eclipse.rse.ui/persistence/org/eclipse/rse/internal/persistence/SerializingProvider.java
@@ -65,7 +65,7 @@ public class SerializingProvider implements IRSEPersistenceProvider
IResource child = children[0];
if (child.getType() == IResource.FILE) {
String profileName = candidateFolder.getName();
- String domFileName = profileName + ".rsedom";
+ String domFileName = profileName + ".rsedom"; //$NON-NLS-1$
String childName = child.getName();
if (childName.equals(domFileName)) {
names.add(profileName);
diff --git a/rse/plugins/org.eclipse.rse.ui/persistence/org/eclipse/rse/internal/persistence/dom/RSEDOMExporter.java b/rse/plugins/org.eclipse.rse.ui/persistence/org/eclipse/rse/internal/persistence/dom/RSEDOMExporter.java
index ca7361dc21c..77e9b45bd1e 100644
--- a/rse/plugins/org.eclipse.rse.ui/persistence/org/eclipse/rse/internal/persistence/dom/RSEDOMExporter.java
+++ b/rse/plugins/org.eclipse.rse.ui/persistence/org/eclipse/rse/internal/persistence/dom/RSEDOMExporter.java
@@ -195,7 +195,7 @@ public class RSEDOMExporter implements IRSEDOMExporter {
node.addAttribute(IRSEDOMConstants.ATTRIBUTE_DEFAULT, getBooleanString(filterPool.isDefault()));
node.addAttribute(IRSEDOMConstants.ATTRIBUTE_STRING_CASE_SENSITIVE, getBooleanString(filterPool.isSetStringsCaseSensitive()));
node.addAttribute(IRSEDOMConstants.ATTRIBUTE_SUPPORTS_DUPLICATE_FILTER_STRINGS, getBooleanString(filterPool.supportsDuplicateFilterStrings()));
- node.addAttribute(IRSEDOMConstants.ATTRIBUTE_RELEASE, "" + filterPool.getRelease());
+ node.addAttribute(IRSEDOMConstants.ATTRIBUTE_RELEASE, "" + filterPool.getRelease()); //$NON-NLS-1$
node.addAttribute(IRSEDOMConstants.ATTRIBUTE_SINGLE_FILTER_STRING_ONLY, getBooleanString(filterPool.isSetSingleFilterStringOnly()));
node.addAttribute(IRSEDOMConstants.ATTRIBUTE_OWNING_PARENT_NAME, filterPool.getOwningParentName());
node.addAttribute(IRSEDOMConstants.ATTRIBUTE_NON_RENAMABLE, getBooleanString(filterPool.isNonRenamable()));
@@ -221,7 +221,7 @@ public class RSEDOMExporter implements IRSEDOMExporter {
if (clean || node.isDirty()) {
node.addAttribute(IRSEDOMConstants.ATTRIBUTE_ID, filter.getName());
node.addAttribute(IRSEDOMConstants.ATTRIBUTE_SUPPORTS_NESTED_FILTERS, getBooleanString(filter.isSupportsNestedFilters()));
- node.addAttribute(IRSEDOMConstants.ATTRIBUTE_RELATIVE_ORDER, "" + filter.getRelativeOrder());
+ node.addAttribute(IRSEDOMConstants.ATTRIBUTE_RELATIVE_ORDER, "" + filter.getRelativeOrder()); //$NON-NLS-1$
node.addAttribute(IRSEDOMConstants.ATTRIBUTE_DEFAULT, getBooleanString(filter.isDefault()));
node.addAttribute(IRSEDOMConstants.ATTRIBUTE_STRING_CASE_SENSITIVE, getBooleanString(filter.isSetStringsCaseSensitive()));
node.addAttribute(IRSEDOMConstants.ATTRIBUTE_PROMPTABLE, getBooleanString(filter.isPromptable()));
@@ -230,7 +230,7 @@ public class RSEDOMExporter implements IRSEDOMExporter {
node.addAttribute(IRSEDOMConstants.ATTRIBUTE_NON_RENAMABLE, getBooleanString(filter.isNonRenamable()));
node.addAttribute(IRSEDOMConstants.ATTRIBUTE_NON_CHANGEABLE, getBooleanString(filter.isNonChangable()));
node.addAttribute(IRSEDOMConstants.ATTRIBUTE_STRINGS_NON_CHANGABLE, getBooleanString(filter.isStringsNonChangable()));
- node.addAttribute(IRSEDOMConstants.ATTRIBUTE_RELEASE, "" + filter.getRelease());
+ node.addAttribute(IRSEDOMConstants.ATTRIBUTE_RELEASE, "" + filter.getRelease()); //$NON-NLS-1$
node.addAttribute(IRSEDOMConstants.ATTRIBUTE_SINGLE_FILTER_STRING_ONLY, getBooleanString(filter.isSetSingleFilterStringOnly()));
}
diff --git a/rse/plugins/org.eclipse.rse.ui/persistence/org/eclipse/rse/persistence/dom/IRSEDOMConstants.java b/rse/plugins/org.eclipse.rse.ui/persistence/org/eclipse/rse/persistence/dom/IRSEDOMConstants.java
index 6ae4210baad..5a99003da1a 100644
--- a/rse/plugins/org.eclipse.rse.ui/persistence/org/eclipse/rse/persistence/dom/IRSEDOMConstants.java
+++ b/rse/plugins/org.eclipse.rse.ui/persistence/org/eclipse/rse/persistence/dom/IRSEDOMConstants.java
@@ -19,70 +19,70 @@ package org.eclipse.rse.persistence.dom;
public interface IRSEDOMConstants
{
// node types
- public static final String TYPE_PROFILE = "Profile";
- public static final String TYPE_PROPERTY_SET = "PropertySet";
- public static final String TYPE_PROPERTY = "Property";
- public static final String TYPE_HOST = "Host";
- public static final String TYPE_FILTER_POOL = "FilterPool";
- public static final String TYPE_FILTER = "Filter";
- public static final String TYPE_FILTER_STRING = "FilterString";
- public static final String TYPE_FILTER_POOL_REFERENCE = "FilterPoolReference";
- public static final String TYPE_CONNECTOR_SERVICE = "ConnectorService";
- public static final String TYPE_SERVER_LAUNCHER = "ServerLauncher";
- public static final String TYPE_SUBSYSTEM = "SubSystem";
+ public static final String TYPE_PROFILE = "Profile"; //$NON-NLS-1$
+ public static final String TYPE_PROPERTY_SET = "PropertySet"; //$NON-NLS-1$
+ public static final String TYPE_PROPERTY = "Property"; //$NON-NLS-1$
+ public static final String TYPE_HOST = "Host"; //$NON-NLS-1$
+ public static final String TYPE_FILTER_POOL = "FilterPool"; //$NON-NLS-1$
+ public static final String TYPE_FILTER = "Filter"; //$NON-NLS-1$
+ public static final String TYPE_FILTER_STRING = "FilterString"; //$NON-NLS-1$
+ public static final String TYPE_FILTER_POOL_REFERENCE = "FilterPoolReference"; //$NON-NLS-1$
+ public static final String TYPE_CONNECTOR_SERVICE = "ConnectorService"; //$NON-NLS-1$
+ public static final String TYPE_SERVER_LAUNCHER = "ServerLauncher"; //$NON-NLS-1$
+ public static final String TYPE_SUBSYSTEM = "SubSystem"; //$NON-NLS-1$
// node attributes
// profile attributes
- public static final String ATTRIBUTE_DEFAULT_PRIVATE="defaultPrivate";
- public static final String ATTRIBUTE_IS_ACTIVE="isActive";
+ public static final String ATTRIBUTE_DEFAULT_PRIVATE="defaultPrivate"; //$NON-NLS-1$
+ public static final String ATTRIBUTE_IS_ACTIVE="isActive"; //$NON-NLS-1$
// subsystem attributes
- public static final String ATTRIBUTE_HIDDEN="hidden";
+ public static final String ATTRIBUTE_HIDDEN="hidden"; //$NON-NLS-1$
// common attributes
- public static final String ATTRIBUTE_NAME="name";
- public static final String ATTRIBUTE_TYPE="type";
+ public static final String ATTRIBUTE_NAME="name"; //$NON-NLS-1$
+ public static final String ATTRIBUTE_TYPE="type"; //$NON-NLS-1$
// host attributes
- public static final String ATTRIBUTE_HOSTNAME = "hostname";
- public static final String ATTRIBUTE_OFFLINE = "offline";
- public static final String ATTRIBUTE_DESCRIPTION = "description";
+ public static final String ATTRIBUTE_HOSTNAME = "hostname"; //$NON-NLS-1$
+ public static final String ATTRIBUTE_OFFLINE = "offline"; //$NON-NLS-1$
+ public static final String ATTRIBUTE_DESCRIPTION = "description"; //$NON-NLS-1$
// ConnectorService attributes
- public static final String ATTRIBUTE_GROUP="group";
- public static final String ATTRIBUTE_USE_SSL="useSSL";
+ public static final String ATTRIBUTE_GROUP="group"; //$NON-NLS-1$
+ public static final String ATTRIBUTE_USE_SSL="useSSL"; //$NON-NLS-1$
// Filter string attributes
- public static final String ATTRIBUTE_STRING = "string";
+ public static final String ATTRIBUTE_STRING = "string"; //$NON-NLS-1$
// filter attributes
- public static final String ATTRIBUTE_SUPPORTS_NESTED_FILTERS = "supportsNestedFilters";
- public static final String ATTRIBUTE_RELATIVE_ORDER = "relativeOrder";
- public static final String ATTRIBUTE_DEFAULT = "default";
- public static final String ATTRIBUTE_STRING_CASE_SENSITIVE = "stringsCaseSensitive";
- public static final String ATTRIBUTE_PROMPTABLE ="promptable";
- public static final String ATTRIBUTE_SUPPORTS_DUPLICATE_FILTER_STRINGS="supportsDuplicateFilterStrings";
- public static final String ATTRIBUTE_NON_DELETABLE="nonDeletable";
- public static final String ATTRIBUTE_NON_RENAMABLE="nonRenamable";
- public static final String ATTRIBUTE_NON_CHANGEABLE="nonChangable";
- public static final String ATTRIBUTE_STRINGS_NON_CHANGABLE="stringsNonChangable";
- public static final String ATTRIBUTE_RELEASE="release";
- public static final String ATTRIBUTE_SINGLE_FILTER_STRING_ONLY="singleFilterStringOnly";
+ public static final String ATTRIBUTE_SUPPORTS_NESTED_FILTERS = "supportsNestedFilters"; //$NON-NLS-1$
+ public static final String ATTRIBUTE_RELATIVE_ORDER = "relativeOrder"; //$NON-NLS-1$
+ public static final String ATTRIBUTE_DEFAULT = "default"; //$NON-NLS-1$
+ public static final String ATTRIBUTE_STRING_CASE_SENSITIVE = "stringsCaseSensitive"; //$NON-NLS-1$
+ public static final String ATTRIBUTE_PROMPTABLE ="promptable"; //$NON-NLS-1$
+ public static final String ATTRIBUTE_SUPPORTS_DUPLICATE_FILTER_STRINGS="supportsDuplicateFilterStrings"; //$NON-NLS-1$
+ public static final String ATTRIBUTE_NON_DELETABLE="nonDeletable"; //$NON-NLS-1$
+ public static final String ATTRIBUTE_NON_RENAMABLE="nonRenamable"; //$NON-NLS-1$
+ public static final String ATTRIBUTE_NON_CHANGEABLE="nonChangable"; //$NON-NLS-1$
+ public static final String ATTRIBUTE_STRINGS_NON_CHANGABLE="stringsNonChangable"; //$NON-NLS-1$
+ public static final String ATTRIBUTE_RELEASE="release"; //$NON-NLS-1$
+ public static final String ATTRIBUTE_SINGLE_FILTER_STRING_ONLY="singleFilterStringOnly"; //$NON-NLS-1$
// server launcher attributes
- public static final String ATTRIBUTE_REXEC_PORT="rexecPort";
- public static final String ATTRIBUTE_DAEMON_PORT="daemonPort";
- public static final String ATTRIBUTE_PORT="port";
- public static final String ATTRIBUTE_SERVER_PATH="serverPath";
- public static final String ATTRIBUTE_SERVER_SCRIPT="serverScript";
- public static final String ATTRIBUTE_RESTRICTED_TYPES="restrictedTypes";
+ public static final String ATTRIBUTE_REXEC_PORT="rexecPort"; //$NON-NLS-1$
+ public static final String ATTRIBUTE_DAEMON_PORT="daemonPort"; //$NON-NLS-1$
+ public static final String ATTRIBUTE_PORT="port"; //$NON-NLS-1$
+ public static final String ATTRIBUTE_SERVER_PATH="serverPath"; //$NON-NLS-1$
+ public static final String ATTRIBUTE_SERVER_SCRIPT="serverScript"; //$NON-NLS-1$
+ public static final String ATTRIBUTE_RESTRICTED_TYPES="restrictedTypes"; //$NON-NLS-1$
- public static final String ATTRIBUTE_VALUE = "value";
- public static final String ATTRIBUTE_ID = "id";
- public static final String ATTRIBUTE_OWNING_PARENT_NAME = "owningParentName";
- public static final String ATTRIBUTE_REF_ID= "refID";
- public static final String ATTRIBUTE_DELETABLE = "deletable";
- public static final String ATTRIBUTE_TRUE = "true";
- public static final String ATTRIBUTE_FALSE = "false";
+ public static final String ATTRIBUTE_VALUE = "value"; //$NON-NLS-1$
+ public static final String ATTRIBUTE_ID = "id"; //$NON-NLS-1$
+ public static final String ATTRIBUTE_OWNING_PARENT_NAME = "owningParentName"; //$NON-NLS-1$
+ public static final String ATTRIBUTE_REF_ID= "refID"; //$NON-NLS-1$
+ public static final String ATTRIBUTE_DELETABLE = "deletable"; //$NON-NLS-1$
+ public static final String ATTRIBUTE_TRUE = "true"; //$NON-NLS-1$
+ public static final String ATTRIBUTE_FALSE = "false"; //$NON-NLS-1$
}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.ui/persistence/org/eclipse/rse/persistence/dom/IRSEDOMExporter.java b/rse/plugins/org.eclipse.rse.ui/persistence/org/eclipse/rse/persistence/dom/IRSEDOMExporter.java
index 947c8792a37..7fb41e3838a 100644
--- a/rse/plugins/org.eclipse.rse.ui/persistence/org/eclipse/rse/persistence/dom/IRSEDOMExporter.java
+++ b/rse/plugins/org.eclipse.rse.ui/persistence/org/eclipse/rse/persistence/dom/IRSEDOMExporter.java
@@ -35,7 +35,7 @@ public interface IRSEDOMExporter
* Creates the RSE DOM for this profile
* @param profile
* @param clean indicates whether to create from scratch or merger
- * @return
+ * @return RSEDOM
*/
RSEDOM createRSEDOM(ISystemProfile profile, boolean clean);
@@ -43,14 +43,14 @@ public interface IRSEDOMExporter
* Creates an RSE DOM for use in persistence
* @param dom
* @param profile
- * @return
+ * @return RSEDOM
*/
public RSEDOM populateRSEDOM(RSEDOM dom, ISystemProfile profile, boolean clean);
/**
* Returns the RSEDOM for this profile iff it exists
* @param profile
- * @return
+ * @return RSEDOM
*/
RSEDOM getRSEDOM(ISystemProfile profile);
@@ -58,7 +58,7 @@ public interface IRSEDOMExporter
* Create a DOM node representing a host
* @param parent
* @param host
- * @return
+ * @return RSEDOMNode
*/
RSEDOMNode createNode(RSEDOMNode parent, IHost host, boolean clean);
@@ -66,7 +66,7 @@ public interface IRSEDOMExporter
* Creates a DOM node for a connector service
* @param parent
* @param connectorService
- * @return
+ * @return RSEDOMNode
*/
RSEDOMNode createNode(RSEDOMNode parent, IConnectorService cs, boolean clean);
@@ -74,7 +74,7 @@ public interface IRSEDOMExporter
* Creates a DOM node for a server launcher
* @param parent
* @param serverLauncher
- * @return
+ * @return RSEDOMNode
*/
RSEDOMNode createNode(RSEDOMNode parent, IServerLauncherProperties sl, boolean clean);
@@ -82,7 +82,7 @@ public interface IRSEDOMExporter
* Creates a DOM node for a subsystem
* @param parent
* @param subSystem
- * @return
+ * @return RSEDOMNode
*/
RSEDOMNode createNode(RSEDOMNode parent, ISubSystem ss, boolean clean);
@@ -90,7 +90,7 @@ public interface IRSEDOMExporter
* Creates a DOM node for a filter
* @param parent
* @param filter
- * @return
+ * @return RSEDOMNode
*/
RSEDOMNode createNode(RSEDOMNode parent, ISystemFilter sf, boolean clean);
@@ -98,7 +98,7 @@ public interface IRSEDOMExporter
* Create a DOM node representing a filter pool
* @param parent
* @param filterPool
- * @return
+ * @return RSEDOMNode
*/
RSEDOMNode createNode(RSEDOMNode parent, ISystemFilterPool fp, boolean clean);
@@ -107,7 +107,7 @@ public interface IRSEDOMExporter
* Creates a DOM node for a filter pool reference
* @param parent
* @param filterPoolReference
- * @return
+ * @return RSEDOMNode
*/
RSEDOMNode createNode(RSEDOMNode parent , ISystemFilterPoolReference fpr, boolean clean);
@@ -115,7 +115,7 @@ public interface IRSEDOMExporter
* Creates a DOM node for a filter string
* @param parent
* @param filterString
- * @return
+ * @return RSEDOMNode
*/
RSEDOMNode createNode(RSEDOMNode parent, ISystemFilterString fs, boolean clean);
@@ -124,7 +124,7 @@ public interface IRSEDOMExporter
* Creates DOM nodes for each associated property set
* @param parent
* @param modelObject
- * @return
+ * @return RSEDOMNode array
*/
RSEDOMNode[] createPropertySetNodes(RSEDOMNode parent, IRSEModelObject mo, boolean clean);
}
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.ui/persistence/org/eclipse/rse/persistence/dom/RSEDOM.java b/rse/plugins/org.eclipse.rse.ui/persistence/org/eclipse/rse/persistence/dom/RSEDOM.java
index 27a91a32448..e3224ea5b15 100644
--- a/rse/plugins/org.eclipse.rse.ui/persistence/org/eclipse/rse/persistence/dom/RSEDOM.java
+++ b/rse/plugins/org.eclipse.rse.ui/persistence/org/eclipse/rse/persistence/dom/RSEDOM.java
@@ -62,30 +62,31 @@ public class RSEDOM extends RSEDOMNode {
return _needsSave;
}
+ //for debugging only
public void print(RSEDOMNode node, String indent) {
String type = node.getType();
String name = node.getName();
RSEDOMNodeAttribute[] attributes = node.getAttributes();
RSEDOMNode[] children = node.getChildren();
- System.out.println(indent + "RSEDOMNode " + type);
- System.out.println(indent + "{");
- String sindent = indent + " ";
+ System.out.println(indent + "RSEDOMNode " + type); //$NON-NLS-1$
+ System.out.println(indent + "{"); //$NON-NLS-1$
+ String sindent = indent + " "; //$NON-NLS-1$
- System.out.println(sindent + "name=" + name);
+ System.out.println(sindent + "name=" + name); //$NON-NLS-1$
for (int i = 0; i < attributes.length; i++) {
RSEDOMNodeAttribute attribute = attributes[i];
String key = attribute.getKey();
String value = attribute.getValue();
- System.out.println(sindent + key + "=" + value);
+ System.out.println(sindent + key + "=" + value); //$NON-NLS-1$
}
- String cindent = sindent + " ";
+ String cindent = sindent + " "; //$NON-NLS-1$
for (int c = 0; c < children.length; c++) {
RSEDOMNode child = children[c];
print(child, cindent);
}
- System.out.println(indent + "}");
+ System.out.println(indent + "}"); //$NON-NLS-1$
}
public Job getSaveJob() {
diff --git a/rse/plugins/org.eclipse.rse.ui/persistence/org/eclipse/rse/persistence/dom/RSEDOMNode.java b/rse/plugins/org.eclipse.rse.ui/persistence/org/eclipse/rse/persistence/dom/RSEDOMNode.java
index c5a0d40ee78..b19c1e65e08 100644
--- a/rse/plugins/org.eclipse.rse.ui/persistence/org/eclipse/rse/persistence/dom/RSEDOMNode.java
+++ b/rse/plugins/org.eclipse.rse.ui/persistence/org/eclipse/rse/persistence/dom/RSEDOMNode.java
@@ -66,7 +66,6 @@ public class RSEDOMNode implements IRSEDOMConstants, Serializable
/**
* Propagate needs save indicator up to the root
- * @param flag
*/
public void markForSave()
{
@@ -103,7 +102,6 @@ public class RSEDOMNode implements IRSEDOMConstants, Serializable
/**
* Returns the name of this node
- * @return
*/
public String getName()
{
@@ -112,7 +110,6 @@ public class RSEDOMNode implements IRSEDOMConstants, Serializable
/**
* Returns the type of this node
- * @return
*/
public String getType()
{
@@ -121,7 +118,6 @@ public class RSEDOMNode implements IRSEDOMConstants, Serializable
/**
* Returns the parent of this node
- * @return
*/
public RSEDOMNode getParent()
{
@@ -130,7 +126,6 @@ public class RSEDOMNode implements IRSEDOMConstants, Serializable
/**
* Returns all the children of this node
- * @return
*/
public RSEDOMNode[] getChildren()
{
@@ -140,7 +135,6 @@ public class RSEDOMNode implements IRSEDOMConstants, Serializable
/**
* Returns the first attribute found that has the specified key
* @param key
- * @return
*/
public RSEDOMNodeAttribute getAttribute(String key)
{
@@ -158,7 +152,6 @@ public class RSEDOMNode implements IRSEDOMConstants, Serializable
/**
* Returns the immediate children of this node that are of the specified type
* @param type
- * @return
*/
public RSEDOMNode[] getChildren(String type)
{
@@ -178,7 +171,6 @@ public class RSEDOMNode implements IRSEDOMConstants, Serializable
* Returns the first immediate child of this node that is of the specified type and name
* @param type
* @param name
- * @return
*/
public RSEDOMNode getChild(String type, String name)
{
@@ -195,7 +187,6 @@ public class RSEDOMNode implements IRSEDOMConstants, Serializable
/**
* Returns all the attributes for this node
- * @return
*/
public RSEDOMNodeAttribute [] getAttributes()
{
diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/AbstractConnectorService.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/AbstractConnectorService.java
index 38b7deccd33..aaf665112b2 100644
--- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/AbstractConnectorService.java
+++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/AbstractConnectorService.java
@@ -138,7 +138,7 @@ public abstract class AbstractConnectorService extends RSEModelObject implements
*/
public String getVersionReleaseModification()
{
- return "";
+ return ""; //$NON-NLS-1$
}
/**
* Not implemented, you should override if possible.
- *
@@ -1025,9 +1026,9 @@ public class SubSystemConfigurationAdapter implements ISubSystemConfigurationAda
filterPoolReferenceActions = new IAction[nbr + nbrChildActions];
filterPoolReferenceActions[fpIdx++] = getRemoveFilterPoolReferenceAction(factory, selectedPool, shell);
filterPoolReferenceActions[fpIdx] = new SystemFilterMoveUpFilterPoolReferenceAction(shell);
- ((ISystemAction) filterPoolReferenceActions[fpIdx++]).setHelp(RSEUIPlugin.HELPPREFIX + "actn0063");
+ ((ISystemAction) filterPoolReferenceActions[fpIdx++]).setHelp(RSEUIPlugin.HELPPREFIX + "actn0063"); //$NON-NLS-1$
filterPoolReferenceActions[fpIdx] = new SystemFilterMoveDownFilterPoolReferenceAction(shell);
- ((ISystemAction) filterPoolReferenceActions[fpIdx++]).setHelp(RSEUIPlugin.HELPPREFIX + "actn0064");
+ ((ISystemAction) filterPoolReferenceActions[fpIdx++]).setHelp(RSEUIPlugin.HELPPREFIX + "actn0064"); //$NON-NLS-1$
}
if (childActions != null)
@@ -1059,7 +1060,7 @@ public class SubSystemConfigurationAdapter implements ISubSystemConfigurationAda
protected IAction getRemoveFilterPoolReferenceAction(ISubSystemConfiguration factory, ISystemFilterPool selectedPool, Shell shell)
{
ISystemAction action = new SystemFilterRemoveFilterPoolReferenceAction(shell);
- action.setHelp(RSEUIPlugin.HELPPREFIX + "actn0062");
+ action.setHelp(RSEUIPlugin.HELPPREFIX + "actn0062"); //$NON-NLS-1$
return action;
}
@@ -1136,8 +1137,8 @@ public class SubSystemConfigurationAdapter implements ISubSystemConfigurationAda
filterActions = new IAction[additionalActions];
SystemFilterCopyFilterAction copyAction = new SystemFilterCopyFilterAction(shell);
copyAction.setPromptString(SystemResources.RESID_COPY_TARGET_FILTERPOOL_PROMPT);
- copyAction.setHelp(RSEUIPlugin.HELPPREFIX + "actn0082");
- copyAction.setDialogHelp(RSEUIPlugin.HELPPREFIX + "dcfr0000");
+ copyAction.setHelp(RSEUIPlugin.HELPPREFIX + "actn0082"); //$NON-NLS-1$
+ copyAction.setDialogHelp(RSEUIPlugin.HELPPREFIX + "dcfr0000"); //$NON-NLS-1$
filterActions[fsIdx++] = copyAction;
// we want to make sure the order is kept consistent at
@@ -1149,14 +1150,14 @@ public class SubSystemConfigurationAdapter implements ISubSystemConfigurationAda
SystemFilterMoveFilterAction moveAction = new SystemFilterMoveFilterAction(shell);
moveAction.setPromptString(SystemResources.RESID_MOVE_TARGET_FILTERPOOL_PROMPT);
- moveAction.setHelp(RSEUIPlugin.HELPPREFIX + "actn0083");
- moveAction.setDialogHelp(RSEUIPlugin.HELPPREFIX + "dmfr0000");
+ moveAction.setHelp(RSEUIPlugin.HELPPREFIX + "actn0083"); //$NON-NLS-1$
+ moveAction.setDialogHelp(RSEUIPlugin.HELPPREFIX + "dmfr0000"); //$NON-NLS-1$
filterActions[fsIdx++] = moveAction;
filterActions[fsIdx] = new SystemFilterMoveUpFilterAction(shell);
- ((SystemFilterMoveUpFilterAction) filterActions[fsIdx++]).setHelp(RSEUIPlugin.HELPPREFIX + "actn0084");
+ ((SystemFilterMoveUpFilterAction) filterActions[fsIdx++]).setHelp(RSEUIPlugin.HELPPREFIX + "actn0084"); //$NON-NLS-1$
filterActions[fsIdx] = new SystemFilterMoveDownFilterAction(shell);
- ((SystemFilterMoveDownFilterAction) filterActions[fsIdx++]).setHelp(RSEUIPlugin.HELPPREFIX + "actn0085");
+ ((SystemFilterMoveDownFilterAction) filterActions[fsIdx++]).setHelp(RSEUIPlugin.HELPPREFIX + "actn0085"); //$NON-NLS-1$
}
// add overridable dynamic actions
if (factory.supportsNestedFilters())
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemAbstractAPIProvider.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemAbstractAPIProvider.java
index c9422e7de7c..2dcd29e64b7 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemAbstractAPIProvider.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemAbstractAPIProvider.java
@@ -18,9 +18,9 @@ package org.eclipse.rse.ui.view;
import org.eclipse.core.runtime.Platform;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.rse.core.SystemAdapterHelpers;
-import org.eclipse.rse.model.ISystemMessageObject;
+import org.eclipse.rse.core.model.ISystemMessageObject;
+import org.eclipse.rse.core.model.SystemMessageObject;
import org.eclipse.rse.model.ISystemRegistry;
-import org.eclipse.rse.model.SystemMessageObject;
import org.eclipse.rse.ui.ISystemMessages;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.swt.widgets.Shell;
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemDNDTransferRunnable.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemDNDTransferRunnable.java
index b4f2d11bb08..b35445a0cef 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemDNDTransferRunnable.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemDNDTransferRunnable.java
@@ -28,15 +28,15 @@ import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.rse.core.SystemBasePlugin;
+import org.eclipse.rse.core.model.ISystemContainer;
+import org.eclipse.rse.core.model.ISystemResourceSet;
import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
import org.eclipse.rse.filters.ISystemFilterReference;
import org.eclipse.rse.model.IHost;
-import org.eclipse.rse.model.ISystemContainer;
import org.eclipse.rse.model.ISystemRegistry;
import org.eclipse.rse.model.ISystemRemoteChangeEvents;
import org.eclipse.rse.model.ISystemResourceChangeEvents;
-import org.eclipse.rse.model.ISystemResourceSet;
import org.eclipse.rse.model.SystemRemoteResourceSet;
import org.eclipse.rse.model.SystemResourceChangeEvent;
import org.eclipse.rse.services.clientserver.messages.SystemMessage;
@@ -149,7 +149,7 @@ public class SystemDNDTransferRunnable extends Job
String targetPath = targetAdapter.getAbsoluteName(target);
boolean sameSubSystemType = true;
- String targetType = "";
+ String targetType = ""; //$NON-NLS-1$
if (targetSubSystem != null)
{
targetType = targetSubSystem.getName();
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemResourceSelectionForm.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemResourceSelectionForm.java
index bff3fa1d628..14b1752d517 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemResourceSelectionForm.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemResourceSelectionForm.java
@@ -169,7 +169,7 @@ public class SystemResourceSelectionForm implements ISelectionChangedListener
}
else
{
- _connectionCombo = new SystemHostCombo(composite_prompts, SWT.NULL, "*", _inputProvider.getSystemConnection(), _inputProvider.allowNewConnection());
+ _connectionCombo = new SystemHostCombo(composite_prompts, SWT.NULL, "*", _inputProvider.getSystemConnection(), _inputProvider.allowNewConnection()); //$NON-NLS-1$
}
_connectionCombo.addSelectionListener(new SelectionAdapter()
@@ -462,7 +462,7 @@ public class SystemResourceSelectionForm implements ISelectionChangedListener
{
clearErrorMessage();
- setPathText("");
+ setPathText(""); //$NON-NLS-1$
setPageComplete();
return; // don't enable OK/Add if selections from different parents
}
@@ -478,7 +478,7 @@ public class SystemResourceSelectionForm implements ISelectionChangedListener
return;
}
clearErrorMessage();
- setPathText("");
+ setPathText(""); //$NON-NLS-1$
setPageComplete();
previousSelection = selectedObject;
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemSelectRemoteObjectAPIProviderImpl.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemSelectRemoteObjectAPIProviderImpl.java
index 3a08caea834..c57637e2e9f 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemSelectRemoteObjectAPIProviderImpl.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemSelectRemoteObjectAPIProviderImpl.java
@@ -193,7 +193,7 @@ public class SystemSelectRemoteObjectAPIProviderImpl
if (string == null)
return;
- if (string.endsWith(","))
+ if (string.endsWith(",")) //$NON-NLS-1$
{
int idx = string.indexOf('/');
if (idx == -1)
@@ -271,7 +271,7 @@ public class SystemSelectRemoteObjectAPIProviderImpl
{
SystemBasePlugin.logDebugMessage(this.getClass().getName(), "*** INPUT FILTER = '" + inputFilterString + "' ***");
String result = inputFilterString;
- if (filterSuffix.equals(" /nf"))
+ if (filterSuffix.equals(" /nf")) //$NON-NLS-1$
result = inputFilterString + filterSuffix;
else
{
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableTreeView.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableTreeView.java
index 11a3e0b43ff..aeaa1bda619 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableTreeView.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableTreeView.java
@@ -138,7 +138,7 @@ implements IMenuListener, ISystemDeleteTarget, ISystemRenameTarget, ISystemSelec
Object value = adapter.getPropertyValue(property);
if (value == null)
{
- value = "";
+ value = ""; //$NON-NLS-1$
}
return value;
}
@@ -308,7 +308,7 @@ implements IMenuListener, ISystemDeleteTarget, ISystemRenameTarget, ISystemSelec
_charWidth = tableTree.getFont().getFontData()[0].getHeight() / 2;
computeLayout();
- _menuManager = new MenuManager("#PopupMenu");
+ _menuManager = new MenuManager("#PopupMenu"); //$NON-NLS-1$
_menuManager.setRemoveAllWhenShown(true);
_menuManager.addMenuListener(this);
Menu menu = _menuManager.createContextMenu(tableTree);
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableTreeViewProvider.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableTreeViewProvider.java
index c003c0f499c..4e9ecfc8eb4 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableTreeViewProvider.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableTreeViewProvider.java
@@ -32,7 +32,7 @@ import org.eclipse.jface.viewers.ITableLabelProvider;
import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.rse.core.SystemAdapterHelpers;
-import org.eclipse.rse.model.ISystemContainer;
+import org.eclipse.rse.core.model.ISystemContainer;
import org.eclipse.swt.graphics.Image;
import org.eclipse.ui.views.properties.IPropertyDescriptor;
@@ -284,7 +284,7 @@ public class SystemTableTreeViewProvider implements ILabelProvider, ITableLabelP
}
}
- return "";
+ return ""; //$NON-NLS-1$
}
}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableView.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableView.java
index 350ed43f1ef..1d7f4006e97 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableView.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableView.java
@@ -46,10 +46,10 @@ import org.eclipse.jface.window.SameShellProvider;
import org.eclipse.rse.core.SystemAdapterHelpers;
import org.eclipse.rse.core.SystemBasePlugin;
import org.eclipse.rse.core.SystemPopupMenuActionContributorManager;
+import org.eclipse.rse.core.model.ISystemContainer;
import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.filters.ISystemFilterReference;
import org.eclipse.rse.model.IHost;
-import org.eclipse.rse.model.ISystemContainer;
import org.eclipse.rse.model.ISystemRegistry;
import org.eclipse.rse.model.ISystemRemoteChangeEvent;
import org.eclipse.rse.model.ISystemRemoteChangeEvents;
@@ -129,7 +129,7 @@ public class SystemTableView
Object value = adapter.getPropertyValue(property);
if (value == null)
{
- value = "";
+ value = ""; //$NON-NLS-1$
}
return value;
}
@@ -299,7 +299,7 @@ public class SystemTableView
_charWidth = table.getFont().getFontData()[0].getHeight() / 2;
computeLayout();
- _menuManager = new MenuManager("#PopupMenu");
+ _menuManager = new MenuManager("#PopupMenu"); //$NON-NLS-1$
_menuManager.setRemoveAllWhenShown(true);
_menuManager.addMenuListener(this);
Menu menu = _menuManager.createContextMenu(table);
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableViewPart.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableViewPart.java
index 156c3e61dca..3cf605e2488 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableViewPart.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableViewPart.java
@@ -43,10 +43,10 @@ import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.window.Window;
import org.eclipse.rse.core.SystemPreferencesManager;
+import org.eclipse.rse.core.model.ISystemContainer;
import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.filters.ISystemFilterReference;
import org.eclipse.rse.model.IHost;
-import org.eclipse.rse.model.ISystemContainer;
import org.eclipse.rse.model.ISystemProfile;
import org.eclipse.rse.model.ISystemRegistry;
import org.eclipse.rse.model.ISystemRemoteChangeEvent;
@@ -145,10 +145,10 @@ public class SystemTableViewPart extends ViewPart implements ISelectionListener,
{
public ForwardAction()
{
- super(SystemResources.ACTION_HISTORY_MOVEFORWARD_LABEL, getEclipseImageDescriptor("elcl16/forward_nav.gif"));
+ super(SystemResources.ACTION_HISTORY_MOVEFORWARD_LABEL, getEclipseImageDescriptor("elcl16/forward_nav.gif")); //$NON-NLS-1$
setTitleToolTip(SystemResources.ACTION_HISTORY_MOVEFORWARD_TOOLTIP);
- setDisabledImageDescriptor(getEclipseImageDescriptor("dlcl16/forward_nav.gif"));
+ setDisabledImageDescriptor(getEclipseImageDescriptor("dlcl16/forward_nav.gif")); //$NON-NLS-1$
}
public void checkEnabledState()
@@ -178,9 +178,9 @@ public class SystemTableViewPart extends ViewPart implements ISelectionListener,
{
public BackwardAction()
{
- super(SystemResources.ACTION_HISTORY_MOVEBACKWARD_LABEL, getEclipseImageDescriptor("elcl16/backward_nav.gif"));
+ super(SystemResources.ACTION_HISTORY_MOVEBACKWARD_LABEL, getEclipseImageDescriptor("elcl16/backward_nav.gif")); //$NON-NLS-1$
setTitleToolTip(SystemResources.ACTION_HISTORY_MOVEBACKWARD_TOOLTIP);
- setDisabledImageDescriptor(getEclipseImageDescriptor("dlcl16/backward_nav.gif"));
+ setDisabledImageDescriptor(getEclipseImageDescriptor("dlcl16/backward_nav.gif")); //$NON-NLS-1$
}
public void checkEnabledState()
@@ -211,9 +211,9 @@ public class SystemTableViewPart extends ViewPart implements ISelectionListener,
private IAdaptable _parent;
public UpAction()
{
- super(SystemResources.ACTION_MOVEUP_LABEL, getEclipseImageDescriptor("elcl16/up_nav.gif"));
+ super(SystemResources.ACTION_MOVEUP_LABEL, getEclipseImageDescriptor("elcl16/up_nav.gif")); //$NON-NLS-1$
- setDisabledImageDescriptor(getEclipseImageDescriptor("dlcl16/up_nav.gif"));
+ setDisabledImageDescriptor(getEclipseImageDescriptor("dlcl16/up_nav.gif")); //$NON-NLS-1$
}
public void checkEnabledState()
@@ -441,7 +441,7 @@ public class SystemTableViewPart extends ViewPart implements ISelectionListener,
_cbName = SystemWidgetHelpers.createCombo(c, null);
GridData textData = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
_cbName.setLayoutData(textData);
- _cbName.setText("*");
+ _cbName.setText("*"); //$NON-NLS-1$
_cbName.setToolTipText(SystemResources.RESID_TABLE_POSITIONTO_ENTRY_TOOLTIP);
this.getShell().setText(SystemResources.RESID_TABLE_POSITIONTO_LABEL);
@@ -451,7 +451,7 @@ public class SystemTableViewPart extends ViewPart implements ISelectionListener,
private void setHelp()
{
- setHelp(RSEUIPlugin.HELPPREFIX + "gnpt0000");
+ setHelp(RSEUIPlugin.HELPPREFIX + "gnpt0000"); //$NON-NLS-1$
}
}
@@ -532,7 +532,7 @@ public class SystemTableViewPart extends ViewPart implements ISelectionListener,
_controls[0] = SystemWidgetHelpers.createTextField(c, null);
GridData textData = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
_controls[0].setLayoutData(textData);
- _controls[0].setText("*");
+ _controls[0].setText("*"); //$NON-NLS-1$
_controls[0].setToolTipText(SystemResources.RESID_TABLE_SUBSET_ENTRY_TOOLTIP);
if (histFilters != null)
@@ -550,7 +550,7 @@ public class SystemTableViewPart extends ViewPart implements ISelectionListener,
_controls[i + 1] = SystemWidgetHelpers.createTextField(c, null);
GridData textData3 = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
_controls[i + 1].setLayoutData(textData3);
- _controls[i + 1].setText("*");
+ _controls[i + 1].setText("*"); //$NON-NLS-1$
if (histFilters != null)
{
_controls[i + 1].setText(histFilters[i + 1]);
@@ -564,7 +564,7 @@ public class SystemTableViewPart extends ViewPart implements ISelectionListener,
private void setHelp()
{
- setHelp(RSEUIPlugin.HELPPREFIX + "gnss0000");
+ setHelp(RSEUIPlugin.HELPPREFIX + "gnss0000"); //$NON-NLS-1$
}
}
@@ -716,7 +716,7 @@ public class SystemTableViewPart extends ViewPart implements ISelectionListener,
String columnWidths = memento.getString(TAG_TABLE_VIEW_COLUMN_WIDTHS_ID);
if (columnWidths != null)
{
- StringTokenizer tok = new StringTokenizer(columnWidths, ",");
+ StringTokenizer tok = new StringTokenizer(columnWidths, ","); //$NON-NLS-1$
int[] colWidths = new int[tok.countTokens()];
int t = 0;
while (tok.hasMoreTokens())
@@ -1007,7 +1007,7 @@ public class SystemTableViewPart extends ViewPart implements ISelectionListener,
private void setHelp()
{
- setHelp(RSEUIPlugin.HELPPREFIX + "gntc0000");
+ setHelp(RSEUIPlugin.HELPPREFIX + "gntc0000"); //$NON-NLS-1$
}
}
@@ -1081,20 +1081,20 @@ public class SystemTableViewPart extends ViewPart implements ISelectionListener,
private IStatusLineManager _statusLine = null;
// constants
- public static final String ID = "org.eclipse.rse.ui.view.systemTableView"; // matches id in plugin.xml, view tag
+ public static final String ID = "org.eclipse.rse.ui.view.systemTableView"; // matches id in plugin.xml, view tag //$NON-NLS-1$
// Restore memento tags
- public static final String TAG_TABLE_VIEW_PROFILE_ID = "tableViewProfileID";
- public static final String TAG_TABLE_VIEW_CONNECTION_ID = "tableViewConnectionID";
- public static final String TAG_TABLE_VIEW_SUBSYSTEM_ID = "tableViewSubsystemID";
- public static final String TAG_TABLE_VIEW_OBJECT_ID = "tableViewObjectID";
- public static final String TAG_TABLE_VIEW_FILTER_ID = "tableViewFilterID";
+ public static final String TAG_TABLE_VIEW_PROFILE_ID = "tableViewProfileID"; //$NON-NLS-1$
+ public static final String TAG_TABLE_VIEW_CONNECTION_ID = "tableViewConnectionID"; //$NON-NLS-1$
+ public static final String TAG_TABLE_VIEW_SUBSYSTEM_ID = "tableViewSubsystemID"; //$NON-NLS-1$
+ public static final String TAG_TABLE_VIEW_OBJECT_ID = "tableViewObjectID"; //$NON-NLS-1$
+ public static final String TAG_TABLE_VIEW_FILTER_ID = "tableViewFilterID"; //$NON-NLS-1$
// Subset memento tags
- public static final String TAG_TABLE_VIEW_SUBSET = "subset";
+ public static final String TAG_TABLE_VIEW_SUBSET = "subset"; //$NON-NLS-1$
// layout memento tags
- public static final String TAG_TABLE_VIEW_COLUMN_WIDTHS_ID = "columnWidths";
+ public static final String TAG_TABLE_VIEW_COLUMN_WIDTHS_ID = "columnWidths"; //$NON-NLS-1$
public void setFocus()
{
@@ -1168,7 +1168,7 @@ public class SystemTableViewPart extends ViewPart implements ISelectionListener,
registry.addSystemResourceChangeListener(this);
registry.addSystemRemoteChangeListener(this);
- SystemWidgetHelpers.setHelp(_viewer.getControl(), RSEUIPlugin.HELPPREFIX + "sysd0000");
+ SystemWidgetHelpers.setHelp(_viewer.getControl(), RSEUIPlugin.HELPPREFIX + "sysd0000"); //$NON-NLS-1$
getSite().registerContextMenu(_viewer.getContextMenuManager(), _viewer);
}
@@ -1270,7 +1270,7 @@ public class SystemTableViewPart extends ViewPart implements ISelectionListener,
try
{
Bundle bundle = Platform.getBundle(PlatformUI.PLUGIN_ID);
- URL installURL = bundle.getEntry("/");
+ URL installURL = bundle.getEntry("/"); //$NON-NLS-1$
URL url = new URL(installURL, iconPath + relativePath);
return ImageDescriptor.createFromURL(url);
}
@@ -1327,9 +1327,9 @@ public class SystemTableViewPart extends ViewPart implements ISelectionListener,
{
menuManager.removeAll();
menuManager.add(_selectColumnsAction);
- menuManager.add(new Separator("View"));
+ menuManager.add(new Separator("View")); //$NON-NLS-1$
menuManager.add(_selectInputAction);
- menuManager.add(new Separator("Filter"));
+ menuManager.add(new Separator("Filter")); //$NON-NLS-1$
menuManager.add(_positionToAction);
menuManager.add(_subsetAction);
@@ -1349,7 +1349,7 @@ public class SystemTableViewPart extends ViewPart implements ISelectionListener,
toolBarManager.add(_refreshAction);
- toolBarManager.add(new Separator("Navigate"));
+ toolBarManager.add(new Separator("Navigate")); //$NON-NLS-1$
// only support history when we're locked
if (_isLocked)
{
@@ -1359,7 +1359,7 @@ public class SystemTableViewPart extends ViewPart implements ISelectionListener,
toolBarManager.add(_upAction);
- toolBarManager.add(new Separator("View"));
+ toolBarManager.add(new Separator("View")); //$NON-NLS-1$
toolBarManager.add(_selectColumnsAction);
}
@@ -1441,7 +1441,7 @@ public class SystemTableViewPart extends ViewPart implements ISelectionListener,
{
if (object == null)
{
- setContentDescription("");
+ setContentDescription(""); //$NON-NLS-1$
}
else
{
@@ -1452,7 +1452,7 @@ public class SystemTableViewPart extends ViewPart implements ISelectionListener,
String name = va.getName(object);
//setPartName(type + " " + name);
- setContentDescription(type + " "+ name);
+ setContentDescription(type + " "+ name); //$NON-NLS-1$
//SystemTableViewProvider provider = (SystemTableViewProvider) _viewer.getContentProvider();
//setTitleImage(provider.getImage(object));
@@ -1729,7 +1729,7 @@ public class SystemTableViewPart extends ViewPart implements ISelectionListener,
}
else
{
- columnWidths += width + ",";
+ columnWidths += width + ","; //$NON-NLS-1$
}
}
memento.putString(TAG_TABLE_VIEW_COLUMN_WIDTHS_ID, columnWidths);
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableViewProvider.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableViewProvider.java
index 37473ae3641..bf4f9d90e0d 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableViewProvider.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableViewProvider.java
@@ -32,7 +32,7 @@ import org.eclipse.jface.viewers.ITableLabelProvider;
import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.rse.core.SystemAdapterHelpers;
-import org.eclipse.rse.model.ISystemContainer;
+import org.eclipse.rse.core.model.ISystemContainer;
import org.eclipse.swt.graphics.Image;
import org.eclipse.ui.views.properties.IPropertyDescriptor;
@@ -270,7 +270,7 @@ public class SystemTableViewProvider implements ILabelProvider, ITableLabelProvi
}
}
- return "";
+ return ""; //$NON-NLS-1$
}
}
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTestFilterStringAPIProviderImpl.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTestFilterStringAPIProviderImpl.java
index b791ae6d99d..c1769de981c 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTestFilterStringAPIProviderImpl.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTestFilterStringAPIProviderImpl.java
@@ -16,10 +16,10 @@
package org.eclipse.rse.ui.view;
import org.eclipse.rse.core.SystemBasePlugin;
+import org.eclipse.rse.core.model.ISystemMessageObject;
+import org.eclipse.rse.core.model.SystemMessageObject;
import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.model.IHost;
-import org.eclipse.rse.model.ISystemMessageObject;
-import org.eclipse.rse.model.SystemMessageObject;
import org.eclipse.rse.ui.ISystemMessages;
import org.eclipse.rse.ui.RSEUIPlugin;
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemView.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemView.java
index 06dd39e6391..4c22e52adfa 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemView.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemView.java
@@ -56,6 +56,8 @@ import org.eclipse.rse.core.SystemBasePlugin;
import org.eclipse.rse.core.SystemElapsedTimer;
import org.eclipse.rse.core.SystemPopupMenuActionContributorManager;
import org.eclipse.rse.core.SystemPreferencesManager;
+import org.eclipse.rse.core.model.ISystemContainer;
+import org.eclipse.rse.core.model.ISystemMessageObject;
import org.eclipse.rse.core.references.IRSEBaseReferencingObject;
import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.filters.ISystemFilter;
@@ -69,8 +71,6 @@ import org.eclipse.rse.filters.ISystemFilterReference;
import org.eclipse.rse.filters.ISystemFilterString;
import org.eclipse.rse.filters.ISystemFilterStringReference;
import org.eclipse.rse.model.IHost;
-import org.eclipse.rse.model.ISystemContainer;
-import org.eclipse.rse.model.ISystemMessageObject;
import org.eclipse.rse.model.ISystemPromptableObject;
import org.eclipse.rse.model.ISystemRegistry;
import org.eclipse.rse.model.ISystemRemoteChangeEvent;
@@ -415,7 +415,7 @@ public class SystemView extends TreeViewer implements ISystemTree,
// -----------------------------
// Enable right-click popup menu
// -----------------------------
- menuMgr = new MenuManager("#PopupMenu");
+ menuMgr = new MenuManager("#PopupMenu"); //$NON-NLS-1$
menuMgr.setRemoveAllWhenShown(true);
menuMgr.addMenuListener(this);
Menu menu = menuMgr.createContextMenu(getTree());
@@ -519,7 +519,7 @@ public class SystemView extends TreeViewer implements ISystemTree,
{
if ((event.character == SWT.DEL) && (event.stateMask == 0) && (((IStructuredSelection)getSelection()).size()>0) )
{
- scanSelections("handleKeyPressed");
+ scanSelections("handleKeyPressed"); //$NON-NLS-1$
/* DKM - 53694
if (showDelete() && canDelete())
{
@@ -859,7 +859,7 @@ public class SystemView extends TreeViewer implements ISystemTree,
// WHEN THAT CHANGES, WILL CALL CANDELETE() HERE. THAT IN TURN WILL CALL SCANSELECTIONS.
// THIS MEANS SCAN SELECTIONS GETS CALL TWICE ON MOST RIGHT CLICK ACTIONS.
if (!selectionFlagsUpdated) // might already be called by the global delete action wh
- scanSelections("fillContextMenu");
+ scanSelections("fillContextMenu"); //$NON-NLS-1$
// ADD COMMON ACTIONS...
@@ -1189,13 +1189,13 @@ public class SystemView extends TreeViewer implements ISystemTree,
return;
else
{
- logMyDebugMessage(this.getClass().getName(),": -----------------------------------------------------------");
- logMyDebugMessage(this.getClass().getName(),": REMOTE SSFID.......: " + element.getSubSystemConfigurationId(firstSelection));
- logMyDebugMessage(this.getClass().getName(),": REMOTE NAME........: " + element.getName(firstSelection));
- logMyDebugMessage(this.getClass().getName(),": REMOTE TYPECATEGORY: " + element.getRemoteTypeCategory(firstSelection));
- logMyDebugMessage(this.getClass().getName(),": REMOTE TYPE........: " + element.getRemoteType(firstSelection));
- logMyDebugMessage(this.getClass().getName(),": REMOTE SUBTYPE.....: " + element.getRemoteSubType(firstSelection));
- logMyDebugMessage(this.getClass().getName(),": REMOTE SUBSUBTYPE..: " + element.getRemoteSubSubType(firstSelection));
+ logMyDebugMessage(this.getClass().getName(),": -----------------------------------------------------------"); //$NON-NLS-1$
+ logMyDebugMessage(this.getClass().getName(),": REMOTE SSFID.......: " + element.getSubSystemConfigurationId(firstSelection)); //$NON-NLS-1$
+ logMyDebugMessage(this.getClass().getName(),": REMOTE NAME........: " + element.getName(firstSelection)); //$NON-NLS-1$
+ logMyDebugMessage(this.getClass().getName(),": REMOTE TYPECATEGORY: " + element.getRemoteTypeCategory(firstSelection)); //$NON-NLS-1$
+ logMyDebugMessage(this.getClass().getName(),": REMOTE TYPE........: " + element.getRemoteType(firstSelection)); //$NON-NLS-1$
+ logMyDebugMessage(this.getClass().getName(),": REMOTE SUBTYPE.....: " + element.getRemoteSubType(firstSelection)); //$NON-NLS-1$
+ logMyDebugMessage(this.getClass().getName(),": REMOTE SUBSUBTYPE..: " + element.getRemoteSubSubType(firstSelection)); //$NON-NLS-1$
}
}
}
@@ -1204,7 +1204,7 @@ public class SystemView extends TreeViewer implements ISystemTree,
if (!debugProperties)
return;
//RSEUIPlugin.logDebugMessage(prefix, msg);
- System.out.println(prefix+" "+msg);
+ System.out.println(prefix+" "+msg); //$NON-NLS-1$
}
/**
@@ -1421,7 +1421,7 @@ public class SystemView extends TreeViewer implements ISystemTree,
if (doTimings && (item instanceof TreeItem) && (((TreeItem)item).getData() != null))
{
elapsedTime.setEndTime();
- System.out.println("Time to expand for " + ((TreeItem)item).getItemCount() + " items: " + elapsedTime);
+ System.out.println("Time to expand for " + ((TreeItem)item).getItemCount() + " items: " + elapsedTime); //$NON-NLS-1$ //$NON-NLS-2$
}
}
@@ -1809,7 +1809,7 @@ public class SystemView extends TreeViewer implements ISystemTree,
case EVENT_ADD_RELATIVE:
if (debug)
{
- logDebugMsg("SV event: EVENT_ADD ");
+ logDebugMsg("SV event: EVENT_ADD "); //$NON-NLS-1$
}
clearSelection();
//refresh(parent);
@@ -1850,7 +1850,7 @@ public class SystemView extends TreeViewer implements ISystemTree,
case EVENT_ADD_MANY:
if (debug)
{
- logDebugMsg("SV event: EVENT_ADD_MANY");
+ logDebugMsg("SV event: EVENT_ADD_MANY"); //$NON-NLS-1$
}
multiSource = _event.getMultiSource();
clearSelection();
@@ -1892,7 +1892,7 @@ public class SystemView extends TreeViewer implements ISystemTree,
for (int idx=0; idx
@@ -150,7 +150,7 @@ public abstract class AbstractConnectorService extends RSEModelObject implements
*/
public String getHomeDirectory()
{
- return "";
+ return ""; //$NON-NLS-1$
}
/**
* Not implemented, you should override if possible.
@@ -162,7 +162,7 @@ public abstract class AbstractConnectorService extends RSEModelObject implements
*/
public String getTempDirectory()
{
- return "";
+ return ""; //$NON-NLS-1$
}
/**
diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/IConnectorService.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/IConnectorService.java
index 8c973a19ee2..7dcd6df17db 100644
--- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/IConnectorService.java
+++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/IConnectorService.java
@@ -129,7 +129,6 @@ public interface IConnectorService extends IRSEModelObject
/**
* Return the host
- * @return
*/
public IHost getHost();
diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/IRemoteContainer.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/IRemoteContainer.java
index e7787240dfb..e2e33cbaa29 100644
--- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/IRemoteContainer.java
+++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/IRemoteContainer.java
@@ -15,8 +15,8 @@
********************************************************************************/
package org.eclipse.rse.core.subsystems;
-import org.eclipse.rse.model.ISystemContainer;
-import org.eclipse.rse.model.ISystemContentsType;
+import org.eclipse.rse.core.model.ISystemContainer;
+import org.eclipse.rse.core.model.ISystemContentsType;
/**
* @author dmcknigh
diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/ISubSystem.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/ISubSystem.java
index f57e2f41e38..4391e02b21a 100644
--- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/ISubSystem.java
+++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/ISubSystem.java
@@ -358,7 +358,7 @@ public interface ISubSystem extends ISystemFilterPoolReferenceManagerProvider, I
* Connect to the remote system.
* In addition to calling getSystem().connect(),this might fire events.
*
- * @param Shell parent shell used to show error message. Null means you will handle showing the error message.
+ * @param shell parent shell used to show error message. Null means you will handle showing the error message.
*/
public void connect(Shell shell) throws Exception;
/**
@@ -371,7 +371,7 @@ public interface ISubSystem extends ISystemFilterPoolReferenceManagerProvider, I
* Connect to the remote system, optionally forcing a signon prompt even if the password
* is cached in memory or on disk.
*
- * @param Shell parent shell used to show error message. Null means you will handle showing the error message.
+ * @param shell parent shell used to show error message. Null means you will handle showing the error message.
* @param forcePrompt forces the prompt dialog to be displayed even if the password is currently
* in memory.
*/
@@ -493,7 +493,7 @@ public interface ISubSystem extends ISystemFilterPoolReferenceManagerProvider, I
* type. Be sure to register your adapter factory.
*
* @param filterString filter pattern for objects to return.
- * @param Shell parent shell used to show error message. Null means you will handle showing the error message.
+ * @param shell parent shell used to show error message. Null means you will handle showing the error message.
* @return Array of objects that are the result of this filter string
*/
public Object[] resolveFilterString(String filterString, Shell shell)
@@ -506,7 +506,7 @@ public interface ISubSystem extends ISystemFilterPoolReferenceManagerProvider, I
* filter strings versus a single filter string.
*
* @param filterStrings array of filter patterns for objects to return.
- * @param Shell parent shell used to show error message. Null means you will handle showing the error message.
+ * @param shell parent shell used to show error message. Null means you will handle showing the error message.
* @return Array of objects that are the result of resolving all the filter strings
*/
public Object[] resolveFilterStrings(String[] filterStrings, Shell shell)
@@ -535,7 +535,7 @@ public interface ISubSystem extends ISystemFilterPoolReferenceManagerProvider, I
*
* @param parent Object that is being expanded.
* @param filterString filter pattern for children of parent.
- * @param Shell parent shell used to show error message. Null means you will handle showing the error message.
+ * @param shell parent shell used to show error message. Null means you will handle showing the error message.
* @return Array of objects that are the result of this filter string
*/
public Object[] resolveFilterString(Object parent, String filterString, Shell shell)
@@ -545,7 +545,7 @@ public interface ISubSystem extends ISystemFilterPoolReferenceManagerProvider, I
* Execute a remote command. This is only applicable if the subsystem factory reports
* true for supportsCommands().
* @param command Command to be executed remotely.
- * @param Shell parent shell used to show error message. Null means you will handle showing the error message.
+ * @param shell parent shell used to show error message. Null means you will handle showing the error message.
* @param Object context context of a command (i.e. working directory). Null is valid and means to use the default context.
* @return Array of objects that are the result of running this command. Typically, these
* are messages logged by the command.
@@ -567,7 +567,7 @@ public interface ISubSystem extends ISystemFilterPoolReferenceManagerProvider, I
* @param subject Identifies which object to get the properties of
* @param key Identifies property to set
* @param value Value to set property to
- * @param Shell parent shell used to show error message. Null means you will handle showing the error message.
+ * @param shell parent shell used to show error message. Null means you will handle showing the error message.
* @return Object interpretable by subsystem. Might be a Boolean, or the might be new value for confirmation.
*/
public Object setProperty(Object subject, String key, String value, Shell shell)
@@ -579,7 +579,7 @@ public interface ISubSystem extends ISystemFilterPoolReferenceManagerProvider, I
* true for supportsProperties().
* @param subject Identifies which object to get the properties of
* @param key Identifies property to get value of
- * @param Shell parent shell used to show error message. Null means you will handle showing the error message.
+ * @param shell parent shell used to show error message. Null means you will handle showing the error message.
* @return String The value of the requested key.
*/
public String getProperty(Object subject, String key, Shell shell)
@@ -590,9 +590,9 @@ public interface ISubSystem extends ISystemFilterPoolReferenceManagerProvider, I
* a number of remote environment variables. This is only applicable if the subsystem factory reports
* true for supportsProperties().
* @param subject Identifies which object to get the properties of
- * @param key Identifies property to set
- * @param value Values to set properties to. One to one mapping to keys by index number
- * @param Shell parent shell used to show error message. Null means you will handle showing the error message.
+ * @param keys Identifies properties to set
+ * @param values Values to set properties to. One to one mapping to keys by index number
+ * @param shell parent shell used to show error message. Null means you will handle showing the error message.
* @return Object interpretable by subsystem. Might be a Boolean, or the might be new values for confirmation.
*/
public Object setProperties(Object subject, String[] keys, String[] values, Shell shell)
@@ -603,9 +603,9 @@ public interface ISubSystem extends ISystemFilterPoolReferenceManagerProvider, I
* a remote environment variable. This is only applicable if the subsystem factory reports
* true for supportsProperties().
* @param subject Identifies which object to get the properties of
- * @param key Identifies property to get value of
- * @param Shell parent shell used to show error message. Null means you will handle showing the error message.
- * @return Object The values of the requested keys.
+ * @param keys Identifies properties to get value of
+ * @param shell parent shell used to show error message. Null means you will handle showing the error message.
+ * @return String[] The values of the requested keys.
*/
public String[] getProperties(Object subject, String[] keys, Shell shell)
throws Exception;
@@ -658,7 +658,6 @@ public interface ISubSystem extends ISystemFilterPoolReferenceManagerProvider, I
* Returns the parent object associated with a filter reference. It's up to the
* subsystem implementation to decide what "parent object" means for a filter reference.
* @param filterRef the filter reference to determine a target object from.
- * @return
*/
Object getTargetForFilter(ISystemFilterReference filterRef);
diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/ISubSystemConfiguration.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/ISubSystemConfiguration.java
index 47cd0224697..392fb692a18 100644
--- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/ISubSystemConfiguration.java
+++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/ISubSystemConfiguration.java
@@ -274,7 +274,7 @@ public interface ISubSystemConfiguration extends ISystemFilterPoolManagerProvide
public Image getGraphicsLiveImage();
/**
* Return the category this subsystem factory subscribes to.
- * @see org.eclipse.rse.model.ISubSystemConfigurationCategories
+ * @see org.eclipse.rse.core.model.ISubSystemConfigurationCategories
*/
public String getCategory();
/**
diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/ISubSystemConfigurationProxy.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/ISubSystemConfigurationProxy.java
index 7c26d0c3a4a..20d1fee6271 100644
--- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/ISubSystemConfigurationProxy.java
+++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/ISubSystemConfigurationProxy.java
@@ -56,7 +56,7 @@ public interface ISubSystemConfigurationProxy
/**
* Return value of the category xml attribute.
* Return the category this subsystem configuration subscribes to.
- * @see org.eclipse.rse.model.ISubSystemConfigurationCategories
+ * @see org.eclipse.rse.core.model.ISubSystemConfigurationCategories
*/
public String getCategory();
/**
diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/RemoteChildrenContentsType.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/RemoteChildrenContentsType.java
index 60fbc21bea3..058a7a035e5 100644
--- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/RemoteChildrenContentsType.java
+++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/RemoteChildrenContentsType.java
@@ -16,14 +16,14 @@
package org.eclipse.rse.core.subsystems;
-import org.eclipse.rse.model.ISystemContentsType;
+import org.eclipse.rse.core.model.ISystemContentsType;
/**
* Represents contents that are children of a container
*/
public class RemoteChildrenContentsType implements ISystemContentsType
{
- public static String CONTENTS_TYPE_CHILDREN = "contents_children";
+ public static String CONTENTS_TYPE_CHILDREN = "contents_children"; //$NON-NLS-1$
public static RemoteChildrenContentsType _instance = new RemoteChildrenContentsType();
public static RemoteChildrenContentsType getInstance()
diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java
index d4da8a2114d..7e89c2b50fd 100644
--- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java
+++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java
@@ -33,6 +33,7 @@ import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.rse.core.SystemBasePlugin;
import org.eclipse.rse.core.SystemPreferencesManager;
import org.eclipse.rse.core.model.IPropertySet;
+import org.eclipse.rse.core.model.ISystemModelChangeEvents;
import org.eclipse.rse.core.model.RSEModelObject;
import org.eclipse.rse.filters.ISystemFilter;
import org.eclipse.rse.filters.ISystemFilterPool;
@@ -43,7 +44,6 @@ import org.eclipse.rse.filters.ISystemFilterPoolReferenceManagerProvider;
import org.eclipse.rse.filters.ISystemFilterReference;
import org.eclipse.rse.filters.ISystemFilterString;
import org.eclipse.rse.model.IHost;
-import org.eclipse.rse.model.ISystemModelChangeEvents;
import org.eclipse.rse.model.ISystemProfile;
import org.eclipse.rse.model.ISystemRegistry;
import org.eclipse.rse.model.ISystemResourceChangeEvents;
@@ -107,7 +107,7 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
{
- protected static final String SUBSYSTEM_FILE_NAME = "subsystem";
+ protected static final String SUBSYSTEM_FILE_NAME = "subsystem"; //$NON-NLS-1$
//protected transient SubSystemConfiguration parentFactory = null;
protected static final int OPERATION_RESOLVE_ABSOLUTE = 0;
@@ -438,7 +438,7 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
*/
protected String getPreferencesKey(String profileName, String connectionName)
{
- String key = profileName + "." + connectionName + "." + getName();
+ String key = profileName + "." + connectionName + "." + getName(); //$NON-NLS-1$ //$NON-NLS-2$
//System.out.println("in SubSystemImpl.getPreferencesKey(): Subsystem key name: " + key);
return key;
}
@@ -672,7 +672,7 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
* since it names a team sharable resource. Not qualified by the profile
* name since that is implicit by being in a profile.
*/
- String name = "CN-" + connectionName; // $NON-NLS-1$
+ String name = "CN-" + connectionName; //$NON-NLS-1$
return name;
}
@@ -746,7 +746,7 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
{
for (int idx=0; !would && (idx