Merge pull request #430 from ISISComputingGroup/Ticket2011_rename_keithley

Rename KEIT -> KHLY

Author: John-Holt-Tessella

base/uk.ac.stfc.isis.ibex.devicescreens/src/uk/ac/stfc/isis/ibex/devicescreens/components/ComponentType.java

@@ -104,7 +104,7 @@ public enum ComponentType {
     /** Pixelman camera. */
     PIXELMAN,
     /** Keithley 2400 Source Meter. */
-    KEIT2400;
+    KHLY2400;
 
 	private Target target;
 

base/uk.ac.stfc.isis.ibex.opis/resources/Keithley2400/CustomInput.opi

@@ -9,7 +9,7 @@
   <height>170</height>
   <macros>
     <include_parent_macros>true</include_parent_macros>
-    <PV_ROOT>$(P)$(KEIT2400)</PV_ROOT>
+    <PV_ROOT>$(P)$(KHLY2400)</PV_ROOT>
   </macros>
   <boy_version>3.1.4.201301231545</boy_version>
   <show_edit_range>true</show_edit_range>
@@ -408,4 +408,4 @@ $(pv_value)</tooltip>
       </font>
     </widget>
   </widget>
-</display>
+</display>

base/uk.ac.stfc.isis.ibex.opis/resources/Keithley2400/Keithley2400.opi

@@ -9,7 +9,7 @@
   <height>600</height>
   <macros>
     <include_parent_macros>true</include_parent_macros>
-    <PV_ROOT>$(P)$(KEIT2400)</PV_ROOT>
+    <PV_ROOT>$(P)$(KHLY2400)</PV_ROOT>
   </macros>
   <boy_version>3.1.4.201301231545</boy_version>
   <show_edit_range>true</show_edit_range>
@@ -441,4 +441,4 @@ from org.csstudio.opibuilder.scriptUtil import ConsoleUtil
       </widget>
     </widget>
   </widget>
-</display>
+</display>

base/uk.ac.stfc.isis.ibex.opis/resources/Keithley2400/OutputMode.opi

@@ -9,7 +9,7 @@
   <height>482</height>
   <macros>
     <include_parent_macros>true</include_parent_macros>
-    <PV_ROOT>$(P)$(KEIT2400)</PV_ROOT>
+    <PV_ROOT>$(P)$(KHLY2400)</PV_ROOT>
   </macros>
   <boy_version>3.1.4.201301231545</boy_version>
   <show_edit_range>true</show_edit_range>
@@ -709,4 +709,4 @@ $(pv_value)</tooltip>
       </font>
     </widget>
   </widget>
-</display>
+</display>

base/uk.ac.stfc.isis.ibex.opis/resources/Keithley2400/ResistanceMode.opi

@@ -9,7 +9,7 @@
   <height>480</height>
   <macros>
     <include_parent_macros>true</include_parent_macros>
-    <PV_ROOT>$(P)$(KEIT2400)</PV_ROOT>
+    <PV_ROOT>$(P)$(KHLY2400)</PV_ROOT>
   </macros>
   <boy_version>3.1.4.201301231545</boy_version>
   <show_edit_range>true</show_edit_range>
@@ -1489,4 +1489,4 @@ $(pv_value)</tooltip>
       </font>
     </widget>
   </widget>
-</display>
+</display>

base/uk.ac.stfc.isis.ibex.opis/resources/opi_info.xml

@@ -188,13 +188,13 @@
 		<entry>
 			<key>Keithley 2400</key>
 			<value>
-				<type>KEIT2400</type>
+				<type>KHLY2400</type>
 				<path>Keithley2400/Keithley2400.opi</path>
 				<description>The OPI for the Keithley 2400 Source Meter.</description>
 				<macros>
 					<macro>
-						<name>KEIT2400</name>
-						<description>The Keithley 2400 PV name (e.g. KEIT2400_01).</description>
+						<name>KHLY2400</name>
+						<description>The Keithley 2400 PV name (e.g. KHLY2400_01).</description>
 					</macro>
 				</macros>
 			</value>
@@ -634,4 +634,4 @@
 			</value>
 		</entry>  		
 	</opis>
-</descriptions>
+</descriptions>

base/uk.ac.stfc.isis.ibex.ui.devicescreens/src/uk/ac/stfc/isis/ibex/ui/devicescreens/ComponentIcons.java

@@ -123,7 +123,7 @@ private static String getIconNameForType(ComponentType componentType) {
                 return "detector_motion_system";
             case PIXELMAN:
                 return "pixelman";
-            case KEIT2400:
+            case KHLY2400:
                 return "keithley2400";
             default:
                 return "cog";