Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
78a990b8a1
|
|
@ -43,8 +43,8 @@ public class ItemRecovery extends JPanel {
|
||||||
Map<String, List<Integer>> ConfigItemJson = new HashMap<>();
|
Map<String, List<Integer>> ConfigItemJson = new HashMap<>();
|
||||||
for (int i = 0; i < rowCount; i++) {
|
for (int i = 0; i < rowCount; i++) {
|
||||||
String Key = tableModel.getValueAt(i, 2).toString();
|
String Key = tableModel.getValueAt(i, 2).toString();
|
||||||
Integer A = (int) tableModel.getValueAt(i, 3);
|
Integer A = (int) tableModel.getValueAt(i, 0);
|
||||||
Integer B = (int) tableModel.getValueAt(i, 0);
|
Integer B = (int) tableModel.getValueAt(i, 3);
|
||||||
Integer C = (int) tableModel.getValueAt(i, 1);
|
Integer C = (int) tableModel.getValueAt(i, 1);
|
||||||
|
|
||||||
List<Integer> Data = new ArrayList<>();
|
List<Integer> Data = new ArrayList<>();
|
||||||
|
|
@ -83,7 +83,7 @@ public class ItemRecovery extends JPanel {
|
||||||
new Object[][] {
|
new Object[][] {
|
||||||
},
|
},
|
||||||
new String[] {
|
new String[] {
|
||||||
"\u6240\u9700\u7269\u54c1\u4ee3\u7801", "\u7269\u54c1\u5151\u6362\u6570\u91cf", "\u7269\u54c1\u5151\u6362\u4ee3\u7801", "\u6240\u9700\u7269\u54c1\u6570\u91cf"
|
"\u7269\u54c1\u5151\u6362\u4ee3\u7801", "\u7269\u54c1\u5151\u6362\u6570\u91cf", "\u6240\u9700\u7269\u54c1\u4ee3\u7801", "\u6240\u9700\u7269\u54c1\u6570\u91cf"
|
||||||
}
|
}
|
||||||
) {
|
) {
|
||||||
Class<?>[] columnTypes = new Class<?>[] {
|
Class<?>[] columnTypes = new Class<?>[] {
|
||||||
|
|
|
||||||
|
|
@ -12,9 +12,9 @@ new FormModel {
|
||||||
add( new FormComponent( "javax.swing.JTable" ) {
|
add( new FormComponent( "javax.swing.JTable" ) {
|
||||||
name: "ItemTable"
|
name: "ItemTable"
|
||||||
"model": new com.jformdesigner.model.SwingTableModel( new java.util.Vector, new java.util.Vector {
|
"model": new com.jformdesigner.model.SwingTableModel( new java.util.Vector, new java.util.Vector {
|
||||||
add( "所需物品代码" )
|
|
||||||
add( "物品兑换数量" )
|
|
||||||
add( "物品兑换代码" )
|
add( "物品兑换代码" )
|
||||||
|
add( "物品兑换数量" )
|
||||||
|
add( "所需物品代码" )
|
||||||
add( "所需物品数量" )
|
add( "所需物品数量" )
|
||||||
}, new java.util.Vector {
|
}, new java.util.Vector {
|
||||||
add( class java.lang.Integer )
|
add( class java.lang.Integer )
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue