From 0de8f9405359cd8bb6e468f1e3da15973ef2f243 Mon Sep 17 00:00:00 2001 From: David McKnight Date: Wed, 3 Jan 2007 19:09:57 +0000 Subject: [PATCH] removing some compile warnings --- .../UI/org/eclipse/rse/internal/ui/view/SystemView.java | 7 +++---- .../UI/org/eclipse/rse/ui/RSEUIPlugin.java | 8 ++++---- .../rse/ui/actions/SystemClearAllPasswordsAction.java | 1 - .../rse/ui/actions/SystemConnectAllSubSystemsAction.java | 1 - .../rse/ui/actions/SystemCopyConnectionAction.java | 1 - .../rse/ui/actions/SystemMoveConnectionAction.java | 1 - .../UI/org/eclipse/rse/ui/dialogs/SystemRenameDialog.java | 2 -- .../eclipse/rse/ui/dialogs/SystemSimpleCopyDialog.java | 3 +-- .../eclipse/rse/ui/dialogs/SystemSimpleSelectDialog.java | 3 +-- .../dialogs/SystemFilterWorkWithFilterPoolsDialog.java | 3 +-- .../rse/ui/open/SystemQuickOpenPageDescriptor.java | 2 +- .../rse/ui/propertypages/SystemBasePropertyPage.java | 6 +++--- .../SystemSubSystemPropertyPageCoreForm.java | 1 - .../rse/ui/view/SystemEmptyListAPIProviderImpl.java | 2 -- .../ui/view/SystemTestFilterStringAPIProviderImpl.java | 6 +----- .../UI/org/eclipse/rse/ui/view/SystemView.java | 7 +++---- .../rse/ui/view/SystemViewFilterPoolReferenceAdapter.java | 1 - .../rse/ui/view/SystemViewFilterReferenceAdapter.java | 1 - .../rse/ui/view/scratchpad/SystemScratchpadView.java | 6 +----- .../internal/subsystems/SubSystemConfigurationProxy.java | 4 ++-- .../org/eclipse/rse/core/SystemPropertyPageExtension.java | 2 +- .../org/eclipse/rse/core/SystemResourceManager.java | 2 +- 22 files changed, 23 insertions(+), 47 deletions(-) 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 55a5f287cf6..b6c7188f9d9 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 @@ -1400,13 +1400,13 @@ public class SystemView extends TreeViewer implements ISystemTree, ISystemResour } protected Item[] sortSelection(Widget parentItem, Item[] oldResult) { - Item[] newResult = new Item[oldResult.length]; Item[] children = null; + Item[] newResult = new Item[oldResult.length]; if (parentItem instanceof Item) { children = oldResult; } else children = getChildren(parentItem); - /* + for (int i = 0; i < oldResult.length; i++) { Item first = removeFirstItem(oldResult, children); @@ -1414,8 +1414,7 @@ public class SystemView extends TreeViewer implements ISystemTree, ISystemResour } return newResult; - */ - return oldResult; + } protected Item removeFirstItem(Item[] items, Item[] children) { diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/RSEUIPlugin.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/RSEUIPlugin.java index e009d91fcd9..e3d6d50d115 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/RSEUIPlugin.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/RSEUIPlugin.java @@ -948,7 +948,7 @@ public class RSEUIPlugin extends SystemBasePlugin implements ISystemMessageProvi if ((iconFile!=null)&&(iconFile.length()>0)) { // get namespace of extension (i.e. the id of the declaring plugin) - String nameSpace = showPrefPagePlugins[idx].getDeclaringExtension().getNamespace(); + String nameSpace = showPrefPagePlugins[idx].getDeclaringExtension().getNamespaceIdentifier(); // now get the associated bundle Bundle bundle = Platform.getBundle(nameSpace); @@ -1118,7 +1118,7 @@ public class RSEUIPlugin extends SystemBasePlugin implements ISystemMessageProvi try { // get the name space of the declaring extension - String nameSpace = systemTypeExtensions[i].getDeclaringExtension().getNamespace(); + String nameSpace = systemTypeExtensions[i].getDeclaringExtension().getNamespaceIdentifier(); // use the name space to get the bundle Bundle bundle = Platform.getBundle(nameSpace); @@ -1155,7 +1155,7 @@ public class RSEUIPlugin extends SystemBasePlugin implements ISystemMessageProvi try { // get the name space of the declaring extension - String nameSpace = systemTypeExtensions[i].getDeclaringExtension().getNamespace(); + String nameSpace = systemTypeExtensions[i].getDeclaringExtension().getNamespaceIdentifier(); String menuExtensionType = systemTypeExtensions[i].getAttribute("class"); //$NON-NLS-1$ @@ -1193,7 +1193,7 @@ public class RSEUIPlugin extends SystemBasePlugin implements ISystemMessageProvi try { // get the name space of the declaring extension - String nameSpace = systemTypeExtensions[i].getDeclaringExtension().getNamespace(); + String nameSpace = systemTypeExtensions[i].getDeclaringExtension().getNamespaceIdentifier(); String keystoreProviderType = systemTypeExtensions[i].getAttribute("class"); //$NON-NLS-1$ diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemClearAllPasswordsAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemClearAllPasswordsAction.java index 00aa52d3bc1..f8617b13282 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemClearAllPasswordsAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemClearAllPasswordsAction.java @@ -95,7 +95,6 @@ public class SystemClearAllPasswordsAction extends SystemBaseAction { if (system.isPasswordCached() || system.isPasswordCached(true)) { // get the user id - String userId = system.getUserId(); // clear userid/password from memory and fire event //DKM and disk now diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemConnectAllSubSystemsAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemConnectAllSubSystemsAction.java index 9cb29b37ec4..9ed22ace3a6 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemConnectAllSubSystemsAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemConnectAllSubSystemsAction.java @@ -75,7 +75,6 @@ public class SystemConnectAllSubSystemsAction extends SystemBaseAction IHost conn = (IHost)getFirstSelection(); try { - Shell shell = getShell(); ISubSystem[] subsystems = conn.getSubSystems(); for (int i = 0; i < subsystems.length; i++) { 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 dc338b0b2d4..69bd250b831 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 @@ -23,7 +23,6 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.ISystemProfile; -import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.ui.ISystemIconConstants; import org.eclipse.rse.ui.ISystemMessages; 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 dd2e9432ed9..cb2a91a1478 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 @@ -23,7 +23,6 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.ISystemProfile; -import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.ui.ISystemIconConstants; import org.eclipse.rse.ui.ISystemMessages; 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 11e3a8d4737..f2b2931d66c 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 @@ -206,7 +206,6 @@ public class SystemRenameDialog extends SystemPromptDialog */ protected ISystemMessageLine createMessageLine(Composite c) { - ISystemMessageLine msgLine = super.createMessageLine(c); return fMessageLine; } @@ -488,7 +487,6 @@ public class SystemRenameDialog extends SystemPromptDialog e.doit = false; ignoreSelection = true; - Control focusControl = Display.getCurrent().getFocusControl(); //System.out.println("...Key pressed. currRow = "+currRow); diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemSimpleCopyDialog.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemSimpleCopyDialog.java index c91cfd7a14a..2f13f196d03 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemSimpleCopyDialog.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemSimpleCopyDialog.java @@ -209,8 +209,7 @@ public class SystemSimpleCopyDialog */ public boolean verify() { - String errMsg = null; - Control controlInError = null; + clearErrorMessage(); /* if (errMsg != null) diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemSimpleSelectDialog.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemSimpleSelectDialog.java index 83739df5f56..a8dd623cbae 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemSimpleSelectDialog.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemSimpleSelectDialog.java @@ -458,8 +458,7 @@ public class SystemSimpleSelectDialog extends SystemPromptDialog */ public boolean verify() { - String errMsg = null; - Control controlInError = null; + clearErrorMessage(); /* if (errMsg != null) diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemFilterWorkWithFilterPoolsDialog.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemFilterWorkWithFilterPoolsDialog.java index a05b51e652e..90d15c87e63 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemFilterWorkWithFilterPoolsDialog.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemFilterWorkWithFilterPoolsDialog.java @@ -353,8 +353,7 @@ public class SystemFilterWorkWithFilterPoolsDialog */ public boolean verify() { - String errMsg = null; - Control controlInError = null; + clearErrorMessage(); /* if (errMsg != null) diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/open/SystemQuickOpenPageDescriptor.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/open/SystemQuickOpenPageDescriptor.java index 42c2d859fe4..d0ed5343554 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/open/SystemQuickOpenPageDescriptor.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/open/SystemQuickOpenPageDescriptor.java @@ -111,7 +111,7 @@ public class SystemQuickOpenPageDescriptor implements Comparable { URL url = null; try { - String nameSpace = element.getDeclaringExtension().getNamespace(); + String nameSpace = element.getDeclaringExtension().getNamespaceIdentifier(); Bundle bundle = Platform.getBundle(nameSpace); url = new URL(bundle.getEntry("/"), imageName); //$NON-NLS-1$ } diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemBasePropertyPage.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemBasePropertyPage.java index c7bc3ca0cc9..b9004933370 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemBasePropertyPage.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemBasePropertyPage.java @@ -20,7 +20,7 @@ import org.eclipse.rse.ui.Mnemonics; import org.eclipse.rse.ui.SystemWidgetHelpers; import org.eclipse.rse.ui.messages.ISystemMessageLine; import org.eclipse.rse.ui.messages.ISystemMessageLineTarget; -import org.eclipse.rse.ui.messages.SystemDialogPageMessageLine; +import org.eclipse.rse.ui.messages.SystemMessageLine; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Cursor; import org.eclipse.swt.layout.GridData; @@ -479,7 +479,7 @@ public abstract class SystemBasePropertyPage extends PropertyPage if (wantAutomaticValidManagement()) setValid(message == null); if (msgLine != null) - ((SystemDialogPageMessageLine)msgLine).internalSetErrorMessage(message); + ((SystemMessageLine)msgLine).setErrorMessage(message); } /** @@ -527,7 +527,7 @@ public abstract class SystemBasePropertyPage extends PropertyPage { super.setMessage(message); if (msgLine!=null) - ((SystemDialogPageMessageLine)msgLine).internalSetMessage(message); + ((SystemMessageLine)msgLine).setMessage(message); } } \ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemSubSystemPropertyPageCoreForm.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemSubSystemPropertyPageCoreForm.java index 229f01264cd..c7f8d40867e 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemSubSystemPropertyPageCoreForm.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemSubSystemPropertyPageCoreForm.java @@ -346,7 +346,6 @@ public class SystemSubSystemPropertyPageCoreForm extends AbstractSystemSubSystem // PROCESS USER ID... if (textUserId != null) { - String userId = getUserId(); updateUserId(ss); } ss.commit(); diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemEmptyListAPIProviderImpl.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemEmptyListAPIProviderImpl.java index 5141a872d01..31bb88970f6 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemEmptyListAPIProviderImpl.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemEmptyListAPIProviderImpl.java @@ -28,8 +28,6 @@ public class SystemEmptyListAPIProviderImpl { - protected Object[] emptyList = new Object[0]; - /** * Constructor */ 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 6e3840dbfd0..074b135a0b0 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 @@ -36,11 +36,7 @@ public class SystemTestFilterStringAPIProviderImpl protected String filterString = null; protected ISubSystem subsystem = null; - protected Object[] emptyList = new Object[0]; - protected Object[] msgList = new Object[1]; - protected SystemMessageObject nullObject = null; - protected SystemMessageObject canceledObject = null; - protected SystemMessageObject errorObject = null; + /** * Constructor * @param subsystem The subsystem that will resolve the filter string 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 55a5f287cf6..b6c7188f9d9 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 @@ -1400,13 +1400,13 @@ public class SystemView extends TreeViewer implements ISystemTree, ISystemResour } protected Item[] sortSelection(Widget parentItem, Item[] oldResult) { - Item[] newResult = new Item[oldResult.length]; Item[] children = null; + Item[] newResult = new Item[oldResult.length]; if (parentItem instanceof Item) { children = oldResult; } else children = getChildren(parentItem); - /* + for (int i = 0; i < oldResult.length; i++) { Item first = removeFirstItem(oldResult, children); @@ -1414,8 +1414,7 @@ public class SystemView extends TreeViewer implements ISystemTree, ISystemResour } return newResult; - */ - return oldResult; + } protected Item removeFirstItem(Item[] items, Item[] children) { diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewFilterPoolReferenceAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewFilterPoolReferenceAdapter.java index 3d566ba3da3..8bd819bf0d8 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewFilterPoolReferenceAdapter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewFilterPoolReferenceAdapter.java @@ -276,7 +276,6 @@ public class SystemViewFilterPoolReferenceAdapter */ public boolean doDelete(Shell shell, Object element, IProgressMonitor monitor) throws Exception { - ISystemFilterPoolReference fpr = getFilterPoolReference(element); ISystemFilterPool fp = getFilterPool(element); ISystemFilterPoolManager fpMgr = fp.getSystemFilterPoolManager(); fpMgr.deleteSystemFilterPool(fp); diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewFilterReferenceAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewFilterReferenceAdapter.java index 95c380d6760..d9d07b668ca 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewFilterReferenceAdapter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewFilterReferenceAdapter.java @@ -377,7 +377,6 @@ public class SystemViewFilterReferenceAdapter if (monitor == null) { - Shell shell = getShell(); allChildren = ss.resolveFilterStrings(filterStrings); } else diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/scratchpad/SystemScratchpadView.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/scratchpad/SystemScratchpadView.java index 7e6103fa746..9c00e97dd24 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/scratchpad/SystemScratchpadView.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/scratchpad/SystemScratchpadView.java @@ -253,9 +253,7 @@ public class SystemScratchpadView getTree().setVisible(true); _objectInput = newObject; - SystemScratchpadViewProvider provider = (SystemScratchpadViewProvider) getContentProvider(); - Object[] children = provider.getChildren(_objectInput); - + super.inputChanged(newObject, oldObject); } else if (newObject == null) @@ -429,7 +427,6 @@ public class SystemScratchpadView remoteResourceNames = (Vector) remoteResource; remoteResource = remoteResourceNames.elementAt(0); } - String remoteResourceParentName = getRemoteResourceAbsoluteName(remoteResourceParent); String remoteResourceName = getRemoteResourceAbsoluteName(remoteResource); if (remoteResourceName == null) return; @@ -524,7 +521,6 @@ public class SystemScratchpadView // -------------------------- case ISystemRemoteChangeEvents.SYSTEM_REMOTE_RESOURCE_RENAMED : { - String oldName = event.getOldName(); Object child = event.getResource(); if (provider != null) diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/internal/subsystems/SubSystemConfigurationProxy.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/internal/subsystems/SubSystemConfigurationProxy.java index e9b74c2a477..bf28eca2252 100644 --- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/internal/subsystems/SubSystemConfigurationProxy.java +++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/internal/subsystems/SubSystemConfigurationProxy.java @@ -246,7 +246,7 @@ public class SubSystemConfigurationProxy implements ISubSystemConfigurationProxy try { // get the name space of the declaring extension - String nameSpace = element.getDeclaringExtension().getNamespace(); + String nameSpace = element.getDeclaringExtension().getNamespaceIdentifier(); String extensionType = element.getAttribute("class"); //$NON-NLS-1$ // use the name space to get the bundle @@ -354,7 +354,7 @@ public class SubSystemConfigurationProxy implements ISubSystemConfigurationProxy protected Bundle getBundle() { - String nameSpace = element.getDeclaringExtension().getNamespace(); + String nameSpace = element.getDeclaringExtension().getNamespaceIdentifier(); return Platform.getBundle(nameSpace); } diff --git a/rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/SystemPropertyPageExtension.java b/rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/SystemPropertyPageExtension.java index d75f17315ad..c37b1475d38 100644 --- a/rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/SystemPropertyPageExtension.java +++ b/rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/SystemPropertyPageExtension.java @@ -238,7 +238,7 @@ public class SystemPropertyPageExtension implements IPropertyPageContributor protected Bundle getBundle(IConfigurationElement element) { - String nameSpace = element.getDeclaringExtension().getNamespace(); + String nameSpace = element.getDeclaringExtension().getNamespaceIdentifier(); return Platform.getBundle(nameSpace); } diff --git a/rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/SystemResourceManager.java b/rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/SystemResourceManager.java index d7fe9f83dfe..2dc2e9ea439 100644 --- a/rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/SystemResourceManager.java +++ b/rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/SystemResourceManager.java @@ -205,7 +205,7 @@ public class SystemResourceManager implements SystemResourceConstants } try{ // create types folder... - IFolder folder = getResourceHelpers().getOrCreateFolder(proj,RESOURCE_TYPE_FILTERS_FOLDER_NAME); + getResourceHelpers().getOrCreateFolder(proj,RESOURCE_TYPE_FILTERS_FOLDER_NAME); } catch (Exception e) { SystemBasePlugin.logError("error opening/creating types folder",e); //$NON-NLS-1$