Added simple swing dialog for generation of model class and interface. Added eclipse launch config for the model generator swing dialog.

org.adempiere.base-feature/model.generator.launch

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
+<booleanAttribute key="append.args" value="true"/>
+<stringAttribute key="application" value="org.adempiere.base.ModelGeneratorApplication"/>
+<booleanAttribute key="askclear" value="true"/>
+<booleanAttribute key="automaticAdd" value="true"/>
+<booleanAttribute key="automaticValidate" value="false"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="true"/>
+<booleanAttribute key="clearws" value="false"/>
+<booleanAttribute key="clearwslog" value="false"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/model.generator"/>
+<booleanAttribute key="default" value="false"/>
+<stringAttribute key="deselected_workspace_plugins" value="org.adempiere.pipo.handlers,org.adempiere.report.jasper.library,event.test,org.adempiere.report.jasper.swing,org.adempiere.server,org.adempiere.base.process,org.adempiere.ui,org.adempiere.ui.swing,org.adempiere.report.jasper,org.adempiere.base.callout,org.adempiere.replication.server,org.adempiere.plugin.utils,org.adempiere.tomcat.config,org.adempiere.pipo,org.adempiere.replication,org.adempiere.ui.zk,org.adempiere.payment.processor,org.adempiere.report.jasper.webapp,org.adempiere.webstore"/>
+<booleanAttribute key="includeOptional" value="true"/>
+<stringAttribute key="location" value="${workspace_loc}/../runtime-New_configuration"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}"/>
+<stringAttribute key="pde.version" value="3.3"/>
+<stringAttribute key="product" value="org.adempiere.server.server_product"/>
+<stringAttribute key="selected_target_plugins" value="com.springsource.javax.el@default:default,org.eclipse.core.runtime@default:true,org.eclipse.equinox.app@default:default,org.eclipse.equinox.preferences@default:default,com.springsource.org.junit@default:default,com.springsource.javax.activation@default:default,com.springsource.javax.jms@default:default,com.springsource.javax.xml.rpc@default:default,com.springsource.org.apache.commons.collections@default:default,com.springsource.org.aopalliance@default:default,org.eclipse.core.variables@default:default,com.springsource.javax.management.j2ee@default:default,org.restlet@default:default,org.apache.ant@default:default,org.springframework.context@default:default,com.springsource.javax.transaction@default:default,com.springsource.net.sf.cglib@default:default,org.eclipse.core.contenttype@default:default,com.springsource.org.apache.activemq@default:default,com.springsource.org.apache.commons.logging@default:default,org.springframework.aop@default:default,org.eclipse.osgi@-1:true,com.springsource.javax.xml.soap@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.equinox.common@2:true,com.springsource.org.apache.kahadb@default:default,com.springsource.javax.servlet@default:default,com.springsource.javax.persistence@default:default,org.eclipse.ant.core@default:default,org.springframework.core@default:default,com.springsource.javax.ejb@default:default,org.eclipse.osgi.services@default:default,com.springsource.org.apache.commons.net@default:default,org.eclipse.equinox.registry@default:default,org.springframework.beans@default:default,com.springsource.org.apache.poi@default:default,org.eclipse.core.jobs@default:default,com.springsource.javax.mail@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.compiere.db.postgresql.provider@default:default,org.compiere.db.oracle.provider@default:default,org.apache.ecs@default:default,org.adempiere.install@default:default,org.adempiere.extend@default:false,org.adempiere.base@default:default"/>
+<booleanAttribute key="show_selected_only" value="false"/>
+<stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="true"/>
+<booleanAttribute key="useProduct" value="false"/>
+</launchConfiguration>

org.adempiere.base/META-INF/MANIFEST.MF

@@ -175,3 +175,4 @@ Eclipse-ExtensibleAPI: true
 Bundle-Activator: org.adempiere.base.BaseActivator
 Service-Component: OSGI-INF/eventmanager.xml
 Bundle-ActivationPolicy: lazy
+Require-Bundle: org.eclipse.equinox.app;bundle-version="1.3.1"

org.adempiere.base/plugin.xml

@@ -40,5 +40,18 @@
             priority="0">
       </exporter>
    </extension>
+   <extension
+         id="org.adempiere.base.ModelGeneratorApplication"
+         name="Model Generator"
+         point="org.eclipse.core.runtime.applications">
+      <application
+            cardinality="singleton-global"
+            thread="main"
+            visible="true">
+         <run
+               class="org.adempiere.base.ModelGeneratorApplication">
+         </run>
+      </application>
+   </extension>
 
 </plugin>

org.adempiere.base/src/org/adempiere/base/ModelGeneratorApplication.java

@@ -0,0 +1,48 @@
+/******************************************************************************
+ * Product: Adempiere ERP & CRM Smart Business Solution                       *
+ * Copyright (C) 2010 Heng Sin Low                							  *
+ * This program is free software; you can redistribute it and/or modify it    *
+ * under the terms version 2 of the GNU General Public License as published   *
+ * by the Free Software Foundation. This program is distributed in the hope   *
+ * that it will be useful, but WITHOUT ANY WARRANTY; without even the implied *
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.           *
+ * See the GNU General Public License for more details.                       *
+ * You should have received a copy of the GNU General Public License along    *
+ * with this program; if not, write to the Free Software Foundation, Inc.,    *
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.                     *
+ *****************************************************************************/
+package org.adempiere.base;
+
+import org.adempiere.util.ModelGeneratorDialog;
+import org.compiere.Adempiere;
+import org.eclipse.equinox.app.IApplication;
+import org.eclipse.equinox.app.IApplicationContext;
+
+/**
+ * @author hengsin
+ *
+ */
+public class ModelGeneratorApplication implements IApplication {
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.equinox.app.IApplication#start(org.eclipse.equinox.app.IApplicationContext)
+	 */
+	@Override
+	public Object start(IApplicationContext context) throws Exception {
+		Adempiere.startup(false);
+		ModelGeneratorDialog dialog = new ModelGeneratorDialog();
+		dialog.setModal(true);
+		dialog.pack();
+		dialog.setLocationRelativeTo(null);
+		dialog.setVisible(true);
+		return IApplication.EXIT_OK;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.equinox.app.IApplication#stop()
+	 */
+	@Override
+	public void stop() {
+	}
+
+}

org.adempiere.base/src/org/adempiere/util/ModelClassGenerator.java

@@ -29,12 +29,12 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Timestamp;
 import java.util.Collection;
+import java.util.StringTokenizer;
 import java.util.TreeSet;
 import java.util.logging.Level;
 
 import org.adempiere.exceptions.DBException;
 import org.compiere.Adempiere;
-import org.compiere.util.CLogMgt;
 import org.compiere.util.CLogger;
 import org.compiere.util.DB;
 import org.compiere.util.DisplayType;
@@ -79,13 +79,13 @@ public class ModelClassGenerator
 		StringBuffer sb = createColumns(AD_Table_ID, mandatory);
 
 		// Header
-		String tableName = createHeader(AD_Table_ID, sb, mandatory, packageName);
+		String className = createHeader(AD_Table_ID, sb, mandatory, packageName);
 
 		// Save
 		if ( ! directory.endsWith(File.separator) )
 			directory += File.separator;
 
-		writeToFile (sb, directory + tableName + ".java");
+		writeToFile (sb, directory + className + ".java");
 	}
 
 	public static final String NL = "\n";
@@ -755,7 +755,7 @@ public class ModelClassGenerator
 			fw.close ();
 			float size = out.length();
 			size /= 1024;
-			log.info(out.getAbsolutePath() + " - " + size + " kB");
+			System.out.println(out.getAbsolutePath() + " - " + size + " kB");
 		}
 		catch (Exception ex)
 		{
@@ -814,77 +814,77 @@ public class ModelClassGenerator
 		return sb.toString();
 	}
 
-
+	/**
-
+	 * @param sourceFolder
-	/**************************************************************************
+	 * @param packageName
-	 * 	Generate PO Model Class.
+	 * @param entityType
-	 * 	<pre>
+	 * @param tableLike
-	 * 	Example: java GenerateModel.class mydirectory myPackage 'U','A'
-	 * 	would generate entity type User and Application classes into mydirectory.
-	 * 	Without parameters, the default is used:
-	 * 	C:\Compiere\compiere-all\extend\src\compiere\model\ compiere.model 'U','A'
-	 * 	</pre>
-	 * 	@param args directory package entityType
-	 * 	- directory where to save the generated file
-	 * 	- package of the classes to be generated
-	 * 	- entityType to be generated
 	 */
-	public static void main (String[] args)
+	public static void generateSource(String sourceFolder, String packageName, String entityType, String tableName)
 	{
-		Adempiere.startupEnvironment(true);
+		if (sourceFolder == null || sourceFolder.trim().length() == 0)
-		CLogMgt.setLevel(Level.FINE);
+			throw new IllegalArgumentException("Must specify source folder");
-		log.info("Generate Model   $Revision: 1.42 $");
-		log.info("----------------------------------");
-		//	first parameter
-		String directory = "C:\\Adempiere\\adempiere-all\\extend\\src\\compiere\\model\\";
-		if (args.length > 0)
-			directory = args[0];
-		if (directory == null || directory.length() == 0)
-		{
-			System.err.println("No Directory");
-			System.exit(1);
-		}
-		log.info("Directory: " + directory);
 
-		//	second parameter
+		File file = new File(sourceFolder);
-		String packageName = "compiere.model";
+		if (!file.exists())
-		if (args.length > 1)
+			throw new IllegalArgumentException("Source folder doesn't exists. sourceFolder="+sourceFolder);
-			packageName = args[1];
-		if (packageName == null || packageName.length() == 0)
-		{
-			System.err.println("No package");
-			System.exit(1);
-		}
-		log.info("Package:   " + packageName);
 
-		//	third parameter
+		if (packageName == null || packageName.trim().length() == 0)
-		String entityType = "'U','A'";	//	User, Application
+			throw new IllegalArgumentException("Must specify package name");
-		if (args.length > 2)
-			entityType = args[2];
-		if (entityType == null || entityType.length() == 0)
-		{
-			System.err.println("No EntityType");
-			System.exit(1);
-		}
-		StringBuffer sql = new StringBuffer("EntityType IN (")
-			.append(entityType).append(")");
-		log.info(sql.toString());
-		log.info("----------------------------------");
 
-		String tableLike = "'%'";	//	All tables
+		if (tableName == null || tableName.trim().length() == 0)
-		//tableLike = "'AD_OrgInfo', 'AD_Role', 'C_CashLine', 'C_Currency', 'C_Invoice', 'C_Order', 'C_Payment', 'M_InventoryLine', 'M_PriceList', 'M_Product', 'U_POSTerminal'";
+			throw new IllegalArgumentException("Must specify table name");
-		if (args.length > 3)
+
-			tableLike = args[3];
+		String tableLike = tableName.trim();
-		log.info("Table Like: " + tableLike);
+		if (!tableLike.startsWith("'") || !tableLike.endsWith("'"))
+			tableLike = "'" + tableLike + "'";
+
+		String entityTypeFilter = null;
+		if (entityType != null && entityType.trim().length() > 0)
+		{
+			entityTypeFilter = "EntityType IN (";
+			StringTokenizer tokenizer = new StringTokenizer(entityType);
+			int i = 0;
+			while(tokenizer.hasMoreTokens()) {
+				String token = tokenizer.nextToken().trim();
+				if (!token.startsWith("'") || !token.endsWith("'"))
+					token = "'" + token + "'";
+				if (i > 0)
+					entityTypeFilter = entityTypeFilter + ",";
+				entityTypeFilter = entityTypeFilter + token;
+				i++;
+			}
+			entityTypeFilter = entityTypeFilter+")";
+		}
+		else
+		{
+			entityTypeFilter = "EntityType IN ('U','A')";
+		}
+
+		String directory = sourceFolder.trim();
+		String packagePath = packageName.replaceAll("[.]", File.separator);
+		if (!(directory.endsWith("/") || directory.endsWith("\\")))
+		{
+			directory = directory + File.separator;
+		}
+		if (File.separator.equals("/"))
+			directory = directory.replaceAll("[\\\\]", File.separator);
+		else
+			directory = directory.replaceAll("[/]", File.separator);
+		directory = directory + packagePath;
+		file = new File(directory);
+		if (!file.exists())
+			file.mkdirs();
 
 		//	complete sql
-		sql.insert(0, "SELECT AD_Table_ID "
+		StringBuffer sql = new StringBuffer();
-			+ "FROM AD_Table "
+		sql.append("SELECT AD_Table_ID ")
-			+ "WHERE (TableName IN ('RV_WarehousePrice','RV_BPartner')"	//	special views
+			.append("FROM AD_Table ")
-			+ " OR IsView='N')"
+			.append("WHERE (TableName IN ('RV_WarehousePrice','RV_BPartner')")	//	special views
-			+ " AND IsActive = 'Y' AND TableName NOT LIKE '%_Trl' AND ");
+			.append(" OR IsView='N')")
+			.append(" AND IsActive = 'Y' AND TableName NOT LIKE '%_Trl' ");
 		sql.append(" AND TableName LIKE ").append(tableLike);
-
+		sql.append(" AND ").append(entityTypeFilter);
 		sql.append(" ORDER BY TableName");
 
 		//
@@ -910,7 +910,5 @@ public class ModelClassGenerator
 			DB.close(rs, pstmt);
 			rs = null; pstmt = null;
 		}
-		log.info("Generated = " + count);
 	}
-
 }

org.adempiere.base/src/org/adempiere/util/ModelGeneratorDialog.java

@@ -0,0 +1,149 @@
+/******************************************************************************
+ * Product: Adempiere ERP & CRM Smart Business Solution                       *
+ * Copyright (C) 2010 Heng Sin Low                							  *
+ * This program is free software; you can redistribute it and/or modify it    *
+ * under the terms version 2 of the GNU General Public License as published   *
+ * by the Free Software Foundation. This program is distributed in the hope   *
+ * that it will be useful, but WITHOUT ANY WARRANTY; without even the implied *
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.           *
+ * See the GNU General Public License for more details.                       *
+ * You should have received a copy of the GNU General Public License along    *
+ * with this program; if not, write to the Free Software Foundation, Inc.,    *
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.                     *
+ *****************************************************************************/
+package org.adempiere.util;
+
+import java.awt.BorderLayout;
+import java.awt.Cursor;
+import java.awt.GridLayout;
+import java.awt.Insets;
+import java.awt.Panel;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JDialog;
+import javax.swing.JFileChooser;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JTextField;
+
+/**
+ *
+ * @author hengsin
+ *
+ */
+public class ModelGeneratorDialog extends JDialog implements ActionListener {
+
+	/**
+	 * default generated serial version Id
+	 */
+	private static final long serialVersionUID = 3546051609729699491L;
+	private JButton bGenerate;
+	private JButton bCancel;
+	private JButton bFolder;
+	private JTextField fFolderName;
+	private JTextField fPackageName;
+	private JTextField fTableName;
+	private JCheckBox fGenerateInterface;
+	private JCheckBox fGenerateClass;
+	private JTextField fEntityType;
+
+	public ModelGeneratorDialog() {
+		super();
+		setTitle("Model Class Generator");
+		BorderLayout layout = new BorderLayout();
+		this.getContentPane().setLayout(layout);
+		Panel confirmPanel = new Panel();
+		this.getContentPane().add(confirmPanel, BorderLayout.SOUTH);
+		Panel mainPanel = new Panel();
+		this.getContentPane().add(mainPanel, BorderLayout.CENTER);
+		mainPanel.setLayout(new GridLayout(5, 2));
+
+		Panel filePanel = new Panel();
+		filePanel.setLayout(new BorderLayout());
+		fFolderName = new JTextField();
+		filePanel.add(fFolderName, BorderLayout.CENTER);
+		bFolder = new JButton("...");
+		bFolder.setMargin(new Insets(0, 0, 0, 0));
+		filePanel.add(bFolder, BorderLayout.EAST);
+		mainPanel.add(new JLabel("Source Folder"));
+		mainPanel.add(filePanel);
+		bFolder.addActionListener(this);
+
+		mainPanel.add(new JLabel("Package Name"));
+		fPackageName = new JTextField("org.adempiere.model");
+		mainPanel.add(fPackageName);
+
+		mainPanel.add(new JLabel("Table Name"));
+		fTableName = new JTextField("%");
+		mainPanel.add(fTableName);
+
+		mainPanel.add(new JLabel("Entity Type"));
+		fEntityType = new JTextField("U,A");
+		mainPanel.add(fEntityType);
+
+		fGenerateInterface = new JCheckBox("Generate Interface");
+		fGenerateInterface.setSelected(true);
+		mainPanel.add(fGenerateInterface);
+		fGenerateClass = new JCheckBox("Generate Class");
+		fGenerateClass.setSelected(false);
+		mainPanel.add(fGenerateClass);
+
+		bGenerate = new JButton("Generate Source");
+		confirmPanel.add(bGenerate);
+		bCancel = new JButton("Cancel");
+		confirmPanel.add(bCancel);
+		bGenerate.addActionListener(this);
+		bCancel.addActionListener(this);
+	}
+
+	@Override
+	public void actionPerformed(ActionEvent e) {
+		if (e.getSource() == bGenerate) {
+			String folder = fFolderName.getText();
+			if (folder == null || folder.trim().length() == 0) {
+				JOptionPane.showMessageDialog(this, "Please enter source folder name", "Error", JOptionPane.ERROR_MESSAGE);
+				return;
+			}
+			String packageName = fPackageName.getText();
+			if (packageName == null || packageName.trim().length() == 0) {
+				JOptionPane.showMessageDialog(this, "Please enter package name", "Error", JOptionPane.ERROR_MESSAGE);
+				return;
+			}
+			String tableName = fTableName.getText();
+			if (tableName == null || tableName.trim().length() == 0) {
+				JOptionPane.showMessageDialog(this, "Please enter table name", "Error", JOptionPane.ERROR_MESSAGE);
+				return;
+			}
+			String entityType = fEntityType.getText();
+			if (entityType == null || entityType.trim().length() == 0) {
+				JOptionPane.showMessageDialog(this, "Please enter entity type", "Error", JOptionPane.ERROR_MESSAGE);
+				return;
+			}
+			if (!fGenerateClass.isSelected() && !fGenerateInterface.isSelected()) {
+				JOptionPane.showMessageDialog(this, "Must select at least one of generate interface or generate class", "Error", JOptionPane.ERROR_MESSAGE);
+				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);
+			}
+			this.dispose();
+		} else if (e.getSource() == bCancel) {
+			this.dispose();
+		} else if (e.getSource() == bFolder) {
+			JFileChooser fileChooser = new JFileChooser();
+			fileChooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
+			int state = fileChooser.showOpenDialog(this);
+			if (state == JFileChooser.APPROVE_OPTION) {
+				fFolderName.setText(fileChooser.getSelectedFile().getAbsolutePath());
+			}
+		}
+	}
+
+}

org.adempiere.base/src/org/adempiere/util/ModelInterfaceGenerator.java

@@ -39,6 +39,7 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.Collection;
+import java.util.StringTokenizer;
 import java.util.TreeSet;
 import java.util.logging.Level;
 
@@ -47,7 +48,6 @@ import org.compiere.Adempiere;
 import org.compiere.model.MEntityType;
 import org.compiere.model.MQuery;
 import org.compiere.model.MTable;
-import org.compiere.util.CLogMgt;
 import org.compiere.util.CLogger;
 import org.compiere.util.DB;
 import org.compiere.util.DisplayType;
@@ -120,7 +120,7 @@ public class ModelInterfaceGenerator
 		{
 
 		} else {
-			directory = directory + "/"; 
+			directory = directory + File.separator;
 		}
 		writeToFile(sb, directory + tableName + ".java");
 	}
@@ -417,7 +417,7 @@ public class ModelInterfaceGenerator
 			fw.close();
 			float size = out.length();
 			size /= 1024;
-			log.info(out.getAbsolutePath() + " - " + size + " kB");
+			System.out.println(out.getAbsolutePath() + " - " + size + " kB");
 		} catch (Exception ex) {
 			log.log(Level.SEVERE, fileName, ex);
 			throw new RuntimeException(ex);
@@ -749,73 +749,77 @@ public class ModelInterfaceGenerator
 		return sb.toString();
 	}
 
-	/***************************************************************************
+	/**
-	 * Generate Interface.
+	 * @param sourceFolder
-	 * 
+	 * @param packageName
-	 * <pre>
+	 * @param entityType
-	 *  	Example: java GenerateInterafce.class mydirectory myPackage 'U','A'
+	 * @param tableLike
-	 *  	would generate entity type User and Application classes into mydirectory.
-	 *  	Without parameters, the default is used:
-	 *  	C:\extend\src\compiere\model\ compiere.model 'U','A'
-	 *  	
-	 * </pre>
-	 * 
-	 * @param args
-	 *            directory package entityType - directory where to save the
-	 *            generated file - package of the classes to be generated -
-	 *            entityType to be generated
 	 */
-	public static void main(String[] args) {
+	public static void generateSource(String sourceFolder, String packageName, String entityType, String tableName)
-		Adempiere.startupEnvironment(true);
+	{
-		CLogMgt.setLevel(Level.FINE);
+		if (sourceFolder == null || sourceFolder.trim().length() == 0)
-		log.info("Generate Interface   $Revision: 1.0 $");
+			throw new IllegalArgumentException("Must specify source folder");
-		log.info("----------------------------------");
+
-		// first parameter
+		File file = new File(sourceFolder);
-		String directory = "C:\\Adempiere\\adempiere-all\\extend\\src\\compiere\\model\\";
+		if (!file.exists())
-		if (args.length > 0)
+			throw new IllegalArgumentException("Source folder doesn't exists. sourceFolder="+sourceFolder);
-			directory = args[0];
+
-		if (directory == null || directory.length() == 0) {
+		if (packageName == null || packageName.trim().length() == 0)
-			System.err.println("No Directory");
+			throw new IllegalArgumentException("Must specify package name");
-			System.exit(1);
+
+		if (tableName == null || tableName.trim().length() == 0)
+			throw new IllegalArgumentException("Must specify table name");
+
+		String tableLike = tableName.trim();
+		if (!tableLike.startsWith("'") || !tableLike.endsWith("'"))
+			tableLike = "'" + tableLike + "'";
+
+		String entityTypeFilter = null;
+		if (entityType != null && entityType.trim().length() > 0)
+		{
+			entityTypeFilter = "EntityType IN (";
+			StringTokenizer tokenizer = new StringTokenizer(entityType);
+			int i = 0;
+			while(tokenizer.hasMoreTokens()) {
+				String token = tokenizer.nextToken().trim();
+				if (!token.startsWith("'") || !token.endsWith("'"))
+					token = "'" + token + "'";
+				if (i > 0)
+					entityTypeFilter = entityTypeFilter + ",";
+				entityTypeFilter = entityTypeFilter + token;
+				i++;
+			}
+			entityTypeFilter = entityTypeFilter+")";
 		}
-		log.info("Directory: " + directory);
+		else
-
+		{
-		// second parameter
+			entityTypeFilter = "EntityType IN ('U','A')";
-		String packageName = "compiere.model";
-		if (args.length > 1)
-			packageName = args[1];
-		if (packageName == null || packageName.length() == 0) {
-			System.err.println("No package");
-			System.exit(1);
 		}
-		log.info("Package:   " + packageName);
 
-		// third parameter
+		String directory = sourceFolder.trim();
-		String entityType = "'U','A'"; // User, Application
+		String packagePath = packageName.replaceAll("[.]", File.separator);
-		if (args.length > 2)
+		if (!(directory.endsWith("/") || directory.endsWith("\\")))
-			entityType = args[2];
+		{
-		if (entityType == null || entityType.length() == 0) {
+			directory = directory + File.separator;
-			System.err.println("No EntityType");
-			System.exit(1);
 		}
-		StringBuffer sql = new StringBuffer("EntityType IN (").append(
+		if (File.separator.equals("/"))
-				entityType).append(")");
+			directory = directory.replaceAll("[\\\\]", File.separator);
-		log.info(sql.toString());
+		else
-		log.info("----------------------------------");
+			directory = directory.replaceAll("[/]", File.separator);
+		directory = directory + packagePath;
+		file = new File(directory);
+		if (!file.exists())
+			file.mkdirs();
 
-		// Table name like
+		//	complete sql
-		String tableLike = "'%'";	//	All tables
+		StringBuffer sql = new StringBuffer();
-		//tableLike = "'AD_OrgInfo', 'AD_Role', 'C_CashLine', 'C_Currency', 'C_Invoice', 'C_Order', 'C_Payment', 'M_InventoryLine', 'M_PriceList', 'M_Product', 'U_POSTerminal'"; // only specific tables
+		sql.append("SELECT AD_Table_ID ")
-		if (args.length > 3)
+			.append("FROM AD_Table ")
-			tableLike = args[3];
+			.append("WHERE (TableName IN ('RV_WarehousePrice','RV_BPartner')")	//	special views
-		log.info("Table Like: " + tableLike);
+			.append(" OR IsView='N')")
-		
+			.append(" AND IsActive = 'Y' AND TableName NOT LIKE '%_Trl' ");
-		// complete sql
-		sql.insert(0, "SELECT AD_Table_ID " + "FROM AD_Table "
-				+ "WHERE (TableName IN ('RV_WarehousePrice','RV_BPartner')" // special views
-				+ " OR IsView='N') AND IsActive = 'Y' AND TableName NOT LIKE '%_Trl' AND ");
 		sql.append(" AND TableName LIKE ").append(tableLike);
-		//sql.append(" AND TableName IN (").append( tableLike ).append(")");
+		sql.append(" AND ").append(entityTypeFilter);
 		sql.append(" ORDER BY TableName");
 
 		//
@@ -826,7 +830,8 @@ public class ModelInterfaceGenerator
 		{
 			pstmt = DB.prepareStatement(sql.toString(), null);
 			rs = pstmt.executeQuery();
-			while (rs.next()) {
+			while (rs.next())
+			{
 				new ModelInterfaceGenerator(rs.getInt(1), directory, packageName);
 				count++;
 			}
@@ -840,8 +845,5 @@ public class ModelInterfaceGenerator
 			DB.close(rs, pstmt);
 			rs = null; pstmt = null;
 		}
-		log.info("Generated = " + count);
-
 	}
-
 }