From 7a602bcb7fb78858ea3e25b57503482b64e3f7d1 Mon Sep 17 00:00:00 2001 From: xiongcz Date: Tue, 13 May 2025 16:56:20 +0800 Subject: [PATCH] =?UTF-8?q?refactor(dialog):=20=E4=BC=98=E5=8C=96=20Create?= =?UTF-8?q?TempDrawingDialog=20=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 注释掉一些不必要的打印语句,减少日志输出 - 修复 JTreeComboBox 在某些情况下的显示问题- 优化 getLovTrueValue 方法,增加参数有效性检查 -调整 checkRequiredProp 方法中的调试输出 --- .../dialogs/CreateTempDrawingDialog.class | Bin 33601 -> 33027 bytes .../dialogs/CreateTempDrawingDialog.java | 56 +++++++++++------- .../utils/JTreeComboBox.java | 2 + 3 files changed, 35 insertions(+), 23 deletions(-) diff --git a/bin/cn/net/connor/createTempDrawings/dialogs/CreateTempDrawingDialog.class b/bin/cn/net/connor/createTempDrawings/dialogs/CreateTempDrawingDialog.class index afc5180559cbcb36d381c66b249ed81499ad78de..9ff7d8792ac9f787fedbbddb705ffb2106dd26c0 100644 GIT binary patch literal 33027 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 literal 33601 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%0DUM1(MMu9eJn=PJ~58!8<0?p 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�b#< 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 diff --git a/src/cn/net/connor/createTempDrawings/dialogs/CreateTempDrawingDialog.java b/src/cn/net/connor/createTempDrawings/dialogs/CreateTempDrawingDialog.java index 9358147..c964781 100644 --- a/src/cn/net/connor/createTempDrawings/dialogs/CreateTempDrawingDialog.java +++ b/src/cn/net/connor/createTempDrawings/dialogs/CreateTempDrawingDialog.java @@ -104,14 +104,14 @@ public class CreateTempDrawingDialog extends JFrame implements ActionListener{ private static Map> rMap = new HashMap>(); public static void printRMap() { - System.out.println("begin ӡrMap"); +// System.out.println("begin ӡrMap"); for (Map.Entry> outerEntry : rMap.entrySet()) { String key = outerEntry.getKey(); Map innerMap = outerEntry.getValue(); - System.out.println("Key: " + key); +// System.out.println("Key: " + key); for (Map.Entry innerEntry : innerMap.entrySet()) { - System.out.println(">>> Inner Key: " + innerEntry.getKey() + ", Value: " + innerEntry.getValue()); +// System.out.println(">>> Inner Key: " + innerEntry.getKey() + ", Value: " + innerEntry.getValue()); } } } @@ -316,7 +316,7 @@ public class CreateTempDrawingDialog extends JFrame implements ActionListener{ } - System.out.println("Ŀ-="+this.propComponentMap.size()); +// System.out.println("Ŀ-="+this.propComponentMap.size()); for (Map.Entry entry : this.propComponentMap.entrySet()) { String key = entry.getKey();//༭Ŀ String value = getComponentValue(entry.getValue());//ȡѡСֵ @@ -459,6 +459,11 @@ public class CreateTempDrawingDialog extends JFrame implements ActionListener{ * @return lovʵֵ */ private String getLovTrueValue(String configName, String lovShowName, List lovPropertyList2) { + //жǷЧ + if (configName == null || lovShowName == null || lovPropertyList2 == null){ + System.out.println("getLovTrueValueЧ"); + return null; + } String trueNameString = null; //ͨlovԼϱȡlovʵֵ for (LovProperty lovProperty : lovPropertyList2) { @@ -710,7 +715,7 @@ public class CreateTempDrawingDialog extends JFrame implements ActionListener{ * @return */ private boolean checkRequiredProp() { - System.out.println("propComponentMap.size="+propComponentMap.size()); +// System.out.println("propComponentMap.size="+propComponentMap.size()); if (propComponentMap.size()>0) { for (Map.Entry entry : propComponentMap.entrySet()) { String key = entry.getKey(); @@ -742,19 +747,24 @@ public class CreateTempDrawingDialog extends JFrame implements ActionListener{ System.out.println("JTextField"); return ((JTextField) component).getText(); } else if (component instanceof JComboBox) { - System.out.println("JComboBox"); String returnValue = null; -// JComboBox comboBox = (JComboBox) component; -// return (String)comboBox.getSelectedItem(); - - JTreeComboBox treeComboBox = (JTreeComboBox ) component; - DefaultMutableTreeNode selectedNode = (DefaultMutableTreeNode) treeComboBox.getSelectedItem(); - if (selectedNode != null) { - Object userObject = selectedNode.getUserObject(); - returnValue = userObject.toString(); + if (component instanceof JTreeComboBox){ + System.out.println("JTreeComboBox"); + JTreeComboBox treeComboBox = (JTreeComboBox) component; + DefaultMutableTreeNode selectedNode = (DefaultMutableTreeNode) treeComboBox.getSelectedItem(); + if (selectedNode != null) { + Object userObject = selectedNode.getUserObject(); + returnValue = userObject.toString(); + }else { + System.out.println("ѡнڵselectedNode = null"); + } + } else { + System.out.println("JComboBox"); + JComboBox comboBox = (JComboBox) component; + returnValue = (String)comboBox.getSelectedItem(); } return returnValue; - } else if (component instanceof DateButton) { + }else if (component instanceof DateButton) { System.out.println("DateButton"); DateButton dateButton = (DateButton) component; Date date = dateButton.getDate(); @@ -936,13 +946,13 @@ public class CreateTempDrawingDialog extends JFrame implements ActionListener{ rMap.clear(); Map lovMap = getLOVDisplay_value(tcSession, lovName); - System.out.println("ʼӡһlov"); - for (String displayValue : lovMap.keySet()){ - System.out.println(" lovMap:"+displayValue+"--"+lovMap.get(displayValue)); - } - printRMap(); +// System.out.println("ʼӡһlov"); +// for (String displayValue : lovMap.keySet()){ +// System.out.println(" lovMap:"+displayValue+"--"+lovMap.get(displayValue)); +// } +// printRMap(); - String[] displayLovName = lovMap.keySet().toArray(new String[0]);//lovʾֵ +// String[] displayLovName = lovMap.keySet().toArray(new String[0]);//lovʾֵ LovProperty lovProperty = new LovProperty();//Զlov͵ lovProperty.setPropName(name); lovProperty.setPropTrueName(trueName); @@ -1107,7 +1117,7 @@ public class CreateTempDrawingDialog extends JFrame implements ActionListener{ */ public static Map getLOVDisplay_value(TCSession seesion,String lovProp) throws TCException { - System.out.println("getLOVDisplay_valueΣlov="+lovProp); +// System.out.println("getLOVDisplay_valueΣlov="+lovProp); Map Display_values = new HashMap(); TCComponentListOfValues unitLov = TCLOVUtil.findLOVByName(seesion, lovProp); @@ -1124,7 +1134,7 @@ public class CreateTempDrawingDialog extends JFrame implements ActionListener{ } }else { - System.out.println("δҵLOV=["+lovProp+"]lov"); +// System.out.println("δҵLOV=["+lovProp+"]lov"); } if (!Display_values.isEmpty()){ rMap.put(lovProp, Display_values); diff --git a/src/cn/net/connor/createTempDrawings/utils/JTreeComboBox.java b/src/cn/net/connor/createTempDrawings/utils/JTreeComboBox.java index 3e2e1cb..2819fa4 100644 --- a/src/cn/net/connor/createTempDrawings/utils/JTreeComboBox.java +++ b/src/cn/net/connor/createTempDrawings/utils/JTreeComboBox.java @@ -108,6 +108,8 @@ public class JTreeComboBox extends JComboBox { TreePath path = new TreePath(node.getPath()); tree.setSelectionPath(path); } + revalidate(); // ָ + repaint(); // ػ } public JTree getTree() {