mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-08 17:45:24 +02:00
Code Issues Wiki Activity

Removing warnings and dead code.

Browse source
This commit is contained in:
David Dykstal 2006-06-14 18:33:35 +00:00
parent ad98ea3625
commit 092a3674d7
8 changed files with 22 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewFilterReferenceAdapter.java
View file

@ -783,16 +783,9 @@ public class SystemViewFilterReferenceAdapter
public static boolean isCommandFilter(ISystemFilter filter) public static boolean isCommandFilter(ISystemFilter filter)
{ {
ISubSystemConfiguration ssf = (ISubSystemConfiguration) filter.getProvider(); ISubSystemConfiguration ssf = (ISubSystemConfiguration) filter.getProvider();
/** TODO - this was originally for iseries..but return ssf.supportsCommands();
* with new model, another approach should be used (maybe via factory api)
if ((ssf != null) && (ssf instanceof IRemoteCmdSubSystemFactory))
return true;
else
**/
return false;
} }
// ------------------------------------------ // ------------------------------------------
// METHODS TO SUPPORT COMMON DRAG AND DROP FUNCTION... // METHODS TO SUPPORT COMMON DRAG AND DROP FUNCTION...
// ------------------------------------------ // ------------------------------------------

8
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewFilterStringAdapter.java
View file

@ -171,14 +171,12 @@ public class SystemViewFilterStringAdapter extends AbstractSystemViewAdapter imp
if (propertyDescriptorArray == null) if (propertyDescriptorArray == null)
{ {
propertyDescriptorArray = new PropertyDescriptor[3]; propertyDescriptorArray = new PropertyDescriptor[3];
RSEUIPlugin plugin = RSEUIPlugin.getDefault();
int idx = 0;
// parent filter pool // parent filter pool
propertyDescriptorArray[idx] = createSimplePropertyDescriptor(P_PARENT_FILTERPOOL,SystemViewResources.RESID_PROPERTY_FILTERPARENTPOOL_LABEL, SystemViewResources.RESID_PROPERTY_FILTERPARENTPOOL_TOOLTIP); propertyDescriptorArray[0] = createSimplePropertyDescriptor(P_PARENT_FILTERPOOL,SystemViewResources.RESID_PROPERTY_FILTERPARENTPOOL_LABEL, SystemViewResources.RESID_PROPERTY_FILTERPARENTPOOL_TOOLTIP);
// parent filter // parent filter
propertyDescriptorArray[++idx] = createSimplePropertyDescriptor(P_PARENT_FILTER,SystemViewResources.RESID_PROPERTY_FILTERPARENTFILTER_LABEL, SystemViewResources.RESID_PROPERTY_FILTERPARENTFILTER_TOOLTIP); propertyDescriptorArray[1] = createSimplePropertyDescriptor(P_PARENT_FILTER,SystemViewResources.RESID_PROPERTY_FILTERPARENTFILTER_LABEL, SystemViewResources.RESID_PROPERTY_FILTERPARENTFILTER_TOOLTIP);
// filter string // filter string
propertyDescriptorArray[++idx] = createSimplePropertyDescriptor(P_FILTERSTRING,SystemViewResources.RESID_PROPERTY_FILTERSTRING_LABEL, SystemViewResources.RESID_PROPERTY_FILTERSTRING_TOOLTIP); propertyDescriptorArray[2] = createSimplePropertyDescriptor(P_FILTERSTRING,SystemViewResources.RESID_PROPERTY_FILTERSTRING_LABEL, SystemViewResources.RESID_PROPERTY_FILTERSTRING_TOOLTIP);
} }
return propertyDescriptorArray; return propertyDescriptorArray;
} }

14
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewPart.java
View file

@ -22,7 +22,6 @@ import java.util.Hashtable;
import java.util.List; import java.util.List;
import java.util.Vector; import java.util.Vector;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.IAdapterFactory; import org.eclipse.core.runtime.IAdapterFactory;
import org.eclipse.core.runtime.IAdapterManager; import org.eclipse.core.runtime.IAdapterManager;
@ -259,8 +258,9 @@ public class SystemViewPart
if (input instanceof IFileEditorInput) if (input instanceof IFileEditorInput)
{ {
IFileEditorInput fileInput = (IFileEditorInput) input; IFileEditorInput fileInput = (IFileEditorInput) input;
IFile file = fileInput.getFile(); fileInput.getFile();
/* FIXME - can't couple this view to files ui /* FIXME - can't couple this view to files ui
IFile file = fileInput.getFile();
SystemIFileProperties properties = new SystemIFileProperties(file); SystemIFileProperties properties = new SystemIFileProperties(file);
Object rmtEditable = properties.getRemoteFileObject(); Object rmtEditable = properties.getRemoteFileObject();
Object remoteObj = null; Object remoteObj = null;
@ -558,8 +558,9 @@ public class SystemViewPart
IEditorInput input = editor.getEditorInput(); IEditorInput input = editor.getEditorInput();
if (input instanceof FileEditorInput) if (input instanceof FileEditorInput)
{ {
IFile file = ((FileEditorInput)input).getFile(); ((FileEditorInput)input).getFile();
/** FIXME - can't couple this view to files ui /** FIXME - can't couple this view to files ui
IFile file = ((FileEditorInput)input).getFile();
if (file.getProject().getName().equals(SystemRemoteEditManager.REMOTE_EDIT_PROJECT_NAME)) if (file.getProject().getName().equals(SystemRemoteEditManager.REMOTE_EDIT_PROJECT_NAME))
{ {
SystemIFileProperties properties = new SystemIFileProperties(file); SystemIFileProperties properties = new SystemIFileProperties(file);
@ -621,9 +622,8 @@ public class SystemViewPart
toolBarMgr.add(collapseAllAction); toolBarMgr.add(collapseAllAction);
toggleLinkingAction = new ToggleLinkingAction(this, org.eclipse.ui.internal.views.navigator.ResourceNavigatorMessages.ToggleLinkingAction_text); toggleLinkingAction = new ToggleLinkingAction(this, SystemViewResources.RESID_PROPERTY_LINKINGACTION_TEXT);
toggleLinkingAction.setToolTipText(SystemViewResources.RESID_PROPERTY_LINKINGACTION_TOOLTIP);
toggleLinkingAction.setToolTipText(org.eclipse.ui.internal.views.navigator.ResourceNavigatorMessages.ToggleLinkingAction_toolTip);
toggleLinkingAction.setImageDescriptor(getNavigatorImageDescriptor(ISystemIconConstants.ICON_IDE_LINKTOEDITOR_ID)); toggleLinkingAction.setImageDescriptor(getNavigatorImageDescriptor(ISystemIconConstants.ICON_IDE_LINKTOEDITOR_ID));
toggleLinkingAction.setHoverImageDescriptor(getNavigatorImageDescriptor(ISystemIconConstants.ICON_IDE_LINKTOEDITOR_ID)); toggleLinkingAction.setHoverImageDescriptor(getNavigatorImageDescriptor(ISystemIconConstants.ICON_IDE_LINKTOEDITOR_ID));
toolBarMgr.add(toggleLinkingAction); toolBarMgr.add(toggleLinkingAction);
@ -1376,7 +1376,7 @@ public class SystemViewPart
{ {
index = token.indexOf('='); index = token.indexOf('=');
String filterName = token.substring(index + 1); String filterName = token.substring(index + 1);
String poolName = token.substring(0, index); // String poolName = token.substring(0, index);
// TODO: handle nested filters. in this case they are separated by ';'. See SystemFilterReferenceAdapter's getMementoHandle() // TODO: handle nested filters. in this case they are separated by ';'. See SystemFilterReferenceAdapter's getMementoHandle()
if (fpRef != null) // should have already been parsed in case 3 if (fpRef != null) // should have already been parsed in case 3
{ {

5
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewPartGotoActionGroup.java
View file

@ -18,7 +18,6 @@ package org.eclipse.rse.ui.view;
import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.action.IMenuManager;
import org.eclipse.jface.action.IToolBarManager; import org.eclipse.jface.action.IToolBarManager;
import org.eclipse.jface.action.MenuManager; import org.eclipse.jface.action.MenuManager;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.rse.ui.GenericMessages; import org.eclipse.rse.ui.GenericMessages;
import org.eclipse.ui.IActionBars; import org.eclipse.ui.IActionBars;
import org.eclipse.ui.actions.ActionFactory; import org.eclipse.ui.actions.ActionFactory;
@ -102,8 +101,6 @@ public class SystemViewPartGotoActionGroup extends ActionGroup
public void updateActionBars() public void updateActionBars()
{ {
IStructuredSelection selection = getContext().getSelection();
(IStructuredSelection) getContext().getSelection();
//goIntoAction.setEnabled(selection.size() == 1);
} }
} }

3
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewResources.java
View file

@ -239,6 +239,9 @@ public class SystemViewResources extends NLS {
public static String RESID_PROPERTY_COMMAND_TOOLTIP; public static String RESID_PROPERTY_COMMAND_TOOLTIP;
public static String RESID_PROPERTY_COMMENT_LABEL; public static String RESID_PROPERTY_COMMENT_LABEL;
public static String RESID_PROPERTY_COMMENT_TOOLTIP; public static String RESID_PROPERTY_COMMENT_TOOLTIP;
public static String RESID_PROPERTY_LINKINGACTION_TEXT;
public static String RESID_PROPERTY_LINKINGACTION_TOOLTIP;
public static String RESID_SCRATCHPAD; public static String RESID_SCRATCHPAD;
public static String RESID_REMOTE_SCRATCHPAD; public static String RESID_REMOTE_SCRATCHPAD;

4
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewResources.properties
View file

@ -208,5 +208,9 @@ RESID_PROPERTY_COMMAND_TOOLTIP=The command that will be executed
RESID_PROPERTY_COMMENT_LABEL=Comment RESID_PROPERTY_COMMENT_LABEL=Comment
RESID_PROPERTY_COMMENT_TOOLTIP=A description RESID_PROPERTY_COMMENT_TOOLTIP=A description
RESID_PROPERTY_LINKINGACTION_TEXT = &Link with Editor
RESID_PROPERTY_LINKINGACTION_TOOLTIP = Link with Editor
RESID_SCRATCHPAD=Scratchpad RESID_SCRATCHPAD=Scratchpad
RESID_REMOTE_SCRATCHPAD=Remote Scratchpad RESID_REMOTE_SCRATCHPAD=Remote Scratchpad

7
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewSubSystemAdapter.java
View file

@ -203,7 +203,6 @@ public class SystemViewSubSystemAdapter extends AbstractSystemViewAdapter
// add our unique property descriptors... // add our unique property descriptors...
//idx = defaultProperties.length; assertion //idx = defaultProperties.length; assertion
RSEUIPlugin plugin = RSEUIPlugin.getDefault();
// user id // user id
//propertyDescriptorArray[idx] = new TextPropertyDescriptor(ISystemPropertyConstants.P_USERID, //propertyDescriptorArray[idx] = new TextPropertyDescriptor(ISystemPropertyConstants.P_USERID,
@ -428,7 +427,7 @@ public class SystemViewSubSystemAdapter extends AbstractSystemViewAdapter
{ {
propertyPortDescriptor.setValidator((ICellEditorValidator)ssFactory.getPortValidator()); propertyPortDescriptor.setValidator((ICellEditorValidator)ssFactory.getPortValidator());
} }
int iPort = ss.getConnectorService().getPort(); ss.getConnectorService().getPort();
port_editable = ssFactory.isPortEditable(); port_editable = ssFactory.isPortEditable();
} }
@ -517,7 +516,7 @@ public class SystemViewSubSystemAdapter extends AbstractSystemViewAdapter
{ {
String property = (String)propertyObject; String property = (String)propertyObject;
ISubSystem ss = (ISubSystem)propertySourceInput; ISubSystem ss = (ISubSystem)propertySourceInput;
ISubSystemConfiguration ssFactory = ss.getSubSystemConfiguration(); ss.getSubSystemConfiguration();
if (property.equals(P_USERID)) if (property.equals(P_USERID))
{ {
updateUserId(ss, original_userIdData); updateUserId(ss, original_userIdData);
@ -537,7 +536,7 @@ public class SystemViewSubSystemAdapter extends AbstractSystemViewAdapter
{ {
String name = (String)property; String name = (String)property;
ISubSystem ss = (ISubSystem)propertySourceInput; ISubSystem ss = (ISubSystem)propertySourceInput;
ISubSystemConfiguration ssFactory = ss.getSubSystemConfiguration(); ss.getSubSystemConfiguration();
//System.out.println("inside setPropVal: " + property + ", value: " + value); //System.out.println("inside setPropVal: " + property + ", value: " + value);
if (name.equals(P_USERID)) if (name.equals(P_USERID))
{ {

6
rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterStringReference.java
View file

@ -26,15 +26,9 @@ import org.eclipse.rse.filters.ISystemFilterStringReference;
import org.eclipse.rse.internal.references.SystemReferencingObjectHelper; import org.eclipse.rse.internal.references.SystemReferencingObjectHelper;
import org.eclipse.rse.references.ISystemBaseReferencedObject; import org.eclipse.rse.references.ISystemBaseReferencedObject;
/** /**
* A reference to a system filter string. * A reference to a system filter string.
*/ */
/*
* DWD What is a filter string REFERENCE? Where would this be used?
*/
public class SystemFilterStringReference public class SystemFilterStringReference
implements ISystemFilterStringReference, IAdaptable implements ISystemFilterStringReference, IAdaptable
{ {