- show system properties

jpage4500 · Oct 20, 2024 · 0ccadcd · 0ccadcd
1 parent d069a0c
commit 0ccadcd
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 12 deletions.
diff --git a/.github/workflows/jdeploy.yml b/.github/workflows/jdeploy.yml
@@ -23,12 +23,6 @@ jobs:
       - name: Build with Maven
         run: mvn -B package --file pom.xml
 
-      # deploy to github
-#      - name: Build App Installer Bundles
-#        uses: shannah/jdeploy@master
-#        with:
-#          github_token: ${{ github.token }}
-
       # deploy to npm:
       # - get app version
       # - update package.json
@@ -55,7 +49,7 @@ jobs:
           npm install jdeploy
           npx jdeploy publish
 
-#      - name: push tag
-#        run: |
-#          git tag "${{ env.DM_VERSION }}"
-#          git push origin --tags
+      - name: push tag
+        run: |
+          git tag "${{ env.DM_VERSION }}"
+          git push origin --tags
diff --git a/src/main/java/com/jpage4500/devicemanager/ui/DeviceScreen.java b/src/main/java/com/jpage4500/devicemanager/ui/DeviceScreen.java
@@ -1359,14 +1359,26 @@ private void handleMemoryClicked(MouseEvent mouseEvent) {
 
         DefaultListModel<String> listModel = new DefaultListModel<>();
         Map<String, String> envMap = System.getenv();
-        TreeMap<String, String> sortedEnvMap = new TreeMap<>(envMap);
+        TreeMap<String, String> sortedEnvMap = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
+        sortedEnvMap.putAll(envMap);
+
+        // add in system properties
+        Properties properties = System.getProperties();
+        for (Map.Entry<Object, Object> prop : properties.entrySet()) {
+            Object key = prop.getKey();
+            Object value = prop.getValue();
+            if (key != null && value != null) {
+                sortedEnvMap.put(key.toString(), value.toString());
+            }
+        }
+
         for (Map.Entry<String, String> entry : sortedEnvMap.entrySet()) {
             listModel.addElement(entry.getKey() + " : " + entry.getValue());
         }
         JList<String> list = new JList<>(listModel);
         list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
         list.setCellRenderer(new AlternatingBackgroundColorRenderer());
-        list.setVisibleRowCount(6);
+        list.setVisibleRowCount(15);
         list.addMouseListener(new MouseAdapter() {
             public void mouseClicked(MouseEvent evt) {
                 if (evt.getClickCount() == 2) {