diff --git a/bin/cn/net/connor/createTempDrawings/dialogs/CreateTempDrawingDialog.class b/bin/cn/net/connor/createTempDrawings/dialogs/CreateTempDrawingDialog.class index afc5180..9ff7d87 100644 Binary files a/bin/cn/net/connor/createTempDrawings/dialogs/CreateTempDrawingDialog.class and b/bin/cn/net/connor/createTempDrawings/dialogs/CreateTempDrawingDialog.class differ 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() {