From 35e51e9bb5e41c565306867c1fda131d7cf78a20 Mon Sep 17 00:00:00 2001 From: Heng Sin Low Date: Mon, 28 May 2012 14:23:09 +0800 Subject: [PATCH] IDEMPIERE-275 ModelGeneratorDialog: EntityTypeFilter not working --- .../src/org/adempiere/util/ModelClassGenerator.java | 2 +- .../src/org/adempiere/util/ModelGeneratorDialog.java | 6 +++--- .../src/org/adempiere/util/ModelInterfaceGenerator.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/org.adempiere.base/src/org/adempiere/util/ModelClassGenerator.java b/org.adempiere.base/src/org/adempiere/util/ModelClassGenerator.java index db7f0187dc..098283f374 100644 --- a/org.adempiere.base/src/org/adempiere/util/ModelClassGenerator.java +++ b/org.adempiere.base/src/org/adempiere/util/ModelClassGenerator.java @@ -843,7 +843,7 @@ public class ModelClassGenerator if (entityType != null && entityType.trim().length() > 0) { entityTypeFilter = "EntityType IN ("; - StringTokenizer tokenizer = new StringTokenizer(entityType); + StringTokenizer tokenizer = new StringTokenizer(entityType, ","); int i = 0; while(tokenizer.hasMoreTokens()) { String token = tokenizer.nextToken().trim(); diff --git a/org.adempiere.base/src/org/adempiere/util/ModelGeneratorDialog.java b/org.adempiere.base/src/org/adempiere/util/ModelGeneratorDialog.java index 7945b18392..2feae96773 100644 --- a/org.adempiere.base/src/org/adempiere/util/ModelGeneratorDialog.java +++ b/org.adempiere.base/src/org/adempiere/util/ModelGeneratorDialog.java @@ -127,12 +127,12 @@ public class ModelGeneratorDialog extends JDialog implements ActionListener { return; } this.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR)); - if (fGenerateClass.isSelected()) { - ModelClassGenerator.generateSource(folder, packageName, entityType, tableName); - } if (fGenerateInterface.isSelected()) { ModelInterfaceGenerator.generateSource(folder, packageName, entityType, tableName); } + if (fGenerateClass.isSelected()) { + ModelClassGenerator.generateSource(folder, packageName, entityType, tableName); + } this.dispose(); } else if (e.getSource() == bCancel) { this.dispose(); diff --git a/org.adempiere.base/src/org/adempiere/util/ModelInterfaceGenerator.java b/org.adempiere.base/src/org/adempiere/util/ModelInterfaceGenerator.java index 8b95d36d28..b57c55a2de 100644 --- a/org.adempiere.base/src/org/adempiere/util/ModelInterfaceGenerator.java +++ b/org.adempiere.base/src/org/adempiere/util/ModelInterfaceGenerator.java @@ -778,7 +778,7 @@ public class ModelInterfaceGenerator if (entityType != null && entityType.trim().length() > 0) { entityTypeFilter = "EntityType IN ("; - StringTokenizer tokenizer = new StringTokenizer(entityType); + StringTokenizer tokenizer = new StringTokenizer(entityType, ","); int i = 0; while(tokenizer.hasMoreTokens()) { String token = tokenizer.nextToken().trim();