Refactor the name for the Alarm Table Item object

shroffk · shroffk · commit a530a7ccb9ba · 2022-07-19T11:48:18.000-04:00
diff --git a/app/alarm/logging-ui/src/main/java/org/phoebus/applications/alarm/logging/ui/AlarmLogTableItem.java b/app/alarm/logging-ui/src/main/java/org/phoebus/applications/alarm/logging/ui/AlarmLogTableItem.java
@@ -9,7 +9,7 @@
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 
 @JsonInclude(Include.NON_NULL)
-public class AlarmLogTableType {
+public class AlarmLogTableItem {
 	private String severity;
     private String message;
     private String value;
diff --git a/app/alarm/logging-ui/src/main/java/org/phoebus/applications/alarm/logging/ui/AlarmLogTableItemAdapterFactory.java b/app/alarm/logging-ui/src/main/java/org/phoebus/applications/alarm/logging/ui/AlarmLogTableItemAdapterFactory.java
@@ -9,7 +9,7 @@
 import java.util.Optional;
 
 /**
- * A factory which adapts {@link AlarmLogTableType}s to {@link TimeStampedProcessVariable} and {@link ProcessVariable}s
+ * A factory which adapts {@link AlarmLogTableItem}s to {@link TimeStampedProcessVariable} and {@link ProcessVariable}s
  * 
  * @author Kunal Shroff
  */
@@ -21,7 +21,7 @@ public class AlarmLogTableTypeAdapterFactory implements AdapterFactory {
     @Override
     public Class getAdaptableObject()
     {
-        return AlarmLogTableType.class;
+        return AlarmLogTableItem.class;
     }
 
     @Override
@@ -33,17 +33,17 @@ public List<? extends Class> getAdapterList()
     @Override
     public <T> Optional<T> adapt(Object adaptableObject, Class<T> adapterType)
     {
-        AlarmLogTableType alarmLogTableType = ((AlarmLogTableType) adaptableObject);
+        AlarmLogTableItem alarmLogTableItem = ((AlarmLogTableItem) adaptableObject);
         if (adapterType.isAssignableFrom(TimeStampedProcessVariable.class))
         {
             return Optional.of(adapterType.cast(
-                    new TimeStampedProcessVariable(alarmLogTableType.getPv(), alarmLogTableType.getMessage_time())));
+                    new TimeStampedProcessVariable(alarmLogTableItem.getPv(), alarmLogTableItem.getMessage_time())));
         } else if (adapterType.isAssignableFrom(ProcessVariable.class))
         {
-            return Optional.of(adapterType.cast(new ProcessVariable(alarmLogTableType.getPv())));
+            return Optional.of(adapterType.cast(new ProcessVariable(alarmLogTableItem.getPv())));
         } else if (adapterType.isAssignableFrom(String.class))
         {
-            return Optional.ofNullable(adapterType.cast("PV name : " + alarmLogTableType.getPv()));
+            return Optional.ofNullable(adapterType.cast("PV name : " + alarmLogTableItem.getPv()));
         }
         return Optional.ofNullable(null);
     }

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`import java.util.Optional;`
`10`	`10`
`11`	`11`	`/**`
`12`		`- * A factory which adapts {@link AlarmLogTableType}s to {@link TimeStampedProcessVariable} and {@link ProcessVariable}s`
	`12`	`+ * A factory which adapts {@link AlarmLogTableItem}s to {@link TimeStampedProcessVariable} and {@link ProcessVariable}s`
`13`	`13`	`*`
`14`	`14`	`* @author Kunal Shroff`
`15`	`15`	`*/`
`@@ -21,7 +21,7 @@ public class AlarmLogTableTypeAdapterFactory implements AdapterFactory {`
`21`	`21`	`@Override`
`22`	`22`	`public Class getAdaptableObject()`
`23`	`23`	`{`
`24`		`- return AlarmLogTableType.class;`
	`24`	`+ return AlarmLogTableItem.class;`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`@Override`
`@@ -33,17 +33,17 @@ public List<? extends Class> getAdapterList()`
`33`	`33`	`@Override`
`34`	`34`	`public <T> Optional<T> adapt(Object adaptableObject, Class<T> adapterType)`
`35`	`35`	`{`
`36`		`- AlarmLogTableType alarmLogTableType = ((AlarmLogTableType) adaptableObject);`
	`36`	`+ AlarmLogTableItem alarmLogTableItem = ((AlarmLogTableItem) adaptableObject);`
`37`	`37`	`if (adapterType.isAssignableFrom(TimeStampedProcessVariable.class))`
`38`	`38`	`{`
`39`	`39`	`return Optional.of(adapterType.cast(`
`40`		`- new TimeStampedProcessVariable(alarmLogTableType.getPv(), alarmLogTableType.getMessage_time())));`
	`40`	`+ new TimeStampedProcessVariable(alarmLogTableItem.getPv(), alarmLogTableItem.getMessage_time())));`
`41`	`41`	`} else if (adapterType.isAssignableFrom(ProcessVariable.class))`
`42`	`42`	`{`
`43`		`- return Optional.of(adapterType.cast(new ProcessVariable(alarmLogTableType.getPv())));`
	`43`	`+ return Optional.of(adapterType.cast(new ProcessVariable(alarmLogTableItem.getPv())));`
`44`	`44`	`} else if (adapterType.isAssignableFrom(String.class))`
`45`	`45`	`{`
`46`		`- return Optional.ofNullable(adapterType.cast("PV name : " + alarmLogTableType.getPv()));`
	`46`	`+ return Optional.ofNullable(adapterType.cast("PV name : " + alarmLogTableItem.getPv()));`
`47`	`47`	`}`
`48`	`48`	`return Optional.ofNullable(null);`
`49`	`49`	`}`