View | Details | Raw Unified | Return to bug 194838 | Differences between
and this patch

Collapse All | Expand All

(-)model/org/eclipse/rse/ui/internal/model/SystemRegistry.java (-2 / +19 lines)
Lines 1056-1066 Link Here
1056
			ISystemDragDropAdapter adapter = null;
1056
			ISystemDragDropAdapter adapter = null;
1057
	    	
1057
	    	
1058
			adapter = (ISystemDragDropAdapter)((IAdaptable)firstObject).getAdapter(ISystemDragDropAdapter.class);
1058
			adapter = (ISystemDragDropAdapter)((IAdaptable)firstObject).getAdapter(ISystemDragDropAdapter.class);
1059
			String subSystemId = null; 
1059
      	
1060
      	
1060
      	  	if (adapter != null ) {
1061
      	  	if (adapter != null ) {
1061
      		  // first need to check subsystems
1062
      		  // first need to check subsystems
1062
      		  ISubSystem subSystem = adapter.getSubSystem(firstObject);
1063
      		  ISubSystem subSystem = adapter.getSubSystem(firstObject);
1063
      		  String subSystemId = getAbsoluteNameForSubSystem(subSystem);
1064
      		  if (null != subSystem)
1065
      		  {
1066
      			  subSystemId = getAbsoluteNameForSubSystem(subSystem);
1067
      		  }
1068
      		  else
1069
      		  {
1070
      			  subSystemId = "";  //$NON-NLS-1$
1071
      		  }
1072
      		
1064
      		  if (firstObjectFullName != null)
1073
      		  if (firstObjectFullName != null)
1065
      		  {
1074
      		  {
1066
      			firstObjectAbsoluteNameWithSubSystemId = subSystemId + ":" + firstObjectFullName; //$NON-NLS-1$
1075
      			firstObjectAbsoluteNameWithSubSystemId = subSystemId + ":" + firstObjectFullName; //$NON-NLS-1$
Lines 1081-1091 Link Here
1081
			ISystemDragDropAdapter adapter = null;
1090
			ISystemDragDropAdapter adapter = null;
1082
	    	
1091
	    	
1083
			adapter = (ISystemDragDropAdapter)((IAdaptable)secondObject).getAdapter(ISystemDragDropAdapter.class);
1092
			adapter = (ISystemDragDropAdapter)((IAdaptable)secondObject).getAdapter(ISystemDragDropAdapter.class);
1093
			String subSystemId = null; 
1084
      	
1094
      	
1085
      	  	if (adapter != null ) {
1095
      	  	if (adapter != null ) {
1086
      		  // first need to check subsystems
1096
      		  // first need to check subsystems
1087
      		  ISubSystem subSystem = adapter.getSubSystem(secondObject);
1097
      		  ISubSystem subSystem = adapter.getSubSystem(secondObject);
1088
      		  String subSystemId = getAbsoluteNameForSubSystem(subSystem);
1098
      		  if (null != subSystem)
1099
    		  {
1100
    			  subSystemId = getAbsoluteNameForSubSystem(subSystem);
1101
    		  }
1102
    		  else
1103
    		  {
1104
    			  subSystemId = "";  //$NON-NLS-1$
1105
    		  }
1089
      		  if (secondObjectFullName != null)
1106
      		  if (secondObjectFullName != null)
1090
    		  {
1107
    		  {
1091
    			secondObjectAbsoluteNameWithSubSystemId = subSystemId + ":" + secondObjectFullName; //$NON-NLS-1$
1108
    			secondObjectAbsoluteNameWithSubSystemId = subSystemId + ":" + secondObjectFullName; //$NON-NLS-1$

Return to bug 194838