Changed delimiter of aliases in stripchart to < >, so it does not to …

…collide with function call parenthesis.
paulscherrerinstitute · Jun 13, 2023 · d680a80 · d680a80
1 parent 7ebb5fd
commit d680a80
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/src/main/java/ch/psi/pshell/ui/StripChart.java b/src/main/java/ch/psi/pshell/ui/StripChart.java
@@ -408,16 +408,16 @@ void updateTooltip(JComponent text, int row) {
                 Type type = Type.valueOf(modelSeries.getValueAt(row, 2).toString());
                 switch (type) {
                     case Channel:
-                        tooltip = "Format: ChannelName [Polling(ms)=-1 Precision=-1] (Alias)";
+                        tooltip = "Format: ChannelName [Polling(ms)=-1 Precision=-1] <Alias>";
                         break;
                     case Device:
-                        tooltip = "Format: DeviceName (Alias)";
+                        tooltip = "Format: DeviceName <Alias>";
                         break;
                     case Stream:
-                        tooltip = "Format: Identifier [Modulo=" + StreamChannel.DEFAULT_MODULO + " Offset=" + StreamChannel.DEFAULT_OFFSET + " GlobalTime=true] (Alias)";
+                        tooltip = "Format: Identifier [Modulo=" + StreamChannel.DEFAULT_MODULO + " Offset=" + StreamChannel.DEFAULT_OFFSET + " GlobalTime=true] <Alias>";
                         break;
                     case CamServer:
-                        tooltip = "Format: URL Identifier (Alias)";
+                        tooltip = "Format: URL Identifier <Alias>";
                         break;
                 }
             }
@@ -1032,8 +1032,8 @@ TimePlotSeries getTimePlotSeries(int row) {
 
     String removeAlias(String str){
         str=str.trim();
-        if (str.endsWith(")")) {
-            int start = str.lastIndexOf('(');
+        if (str.endsWith(">")) {
+            int start = str.lastIndexOf('<');
             if (start>=0){
                 str=str.substring(0, start);
             }
@@ -1063,9 +1063,9 @@ String[] getChannelArgs(String str){
 
     String getChannelAlias(String str){
         str=str.trim();
-        if (str.endsWith(")")) {
-            int end = str.lastIndexOf(')');            
-            int start = str.lastIndexOf('(');
+        if (str.endsWith(">")) {
+            int end = str.lastIndexOf('>');            
+            int start = str.lastIndexOf('<');
             if (start>=0){
                 String alias = str.substring(start + 1, end);
                 if (!alias.isBlank()){