Issue #14 - Part 1 (constructor setting default library) resolved.

seidewitz · seidewitz · commit ffcd85506bc7 · 2016-03-07T17:28:03.000-05:00
diff --git a/org.modeldriven.alf.eclipse.papyrus/src/org/modeldriven/alf/eclipse/papyrus/execution/Alf.java b/org.modeldriven.alf.eclipse.papyrus/src/org/modeldriven/alf/eclipse/papyrus/execution/Alf.java
@@ -123,15 +123,7 @@ protected void configure() {
 	   }
    }
    
-   public Alf() {
-	   super();
-   }
-    
-   public Alf(String[] args) {
-        super(args);
-   }
-   
    public static void main(String[] args) {
-       new Alf(args);
+       new Alf().run(args);
    }
 }
diff --git a/org.modeldriven.alf.eclipse/UML/_RunTests.uml b/org.modeldriven.alf.eclipse/UML/_RunTests.uml
diff --git a/org.modeldriven.alf.eclipse/lib/alf-base.jar b/org.modeldriven.alf.eclipse/lib/alf-base.jar
diff --git a/org.modeldriven.alf.eclipse/src/org/modeldriven/alf/eclipse/fuml/execution/AlfCompiler.java b/org.modeldriven.alf.eclipse/src/org/modeldriven/alf/eclipse/fuml/execution/AlfCompiler.java
@@ -18,8 +18,10 @@
 import org.eclipse.emf.ecore.resource.Resource;
 
 public class AlfCompiler extends org.modeldriven.alf.fuml.execution.AlfCompiler {
+	
+	public static final String DEFAULT_UML_DIRECTORY = "UML";
     
-	protected String umlDirectory;
+	protected String umlDirectory = DEFAULT_UML_DIRECTORY;
 	
 	protected void setUmlDirectory(String umlDirectory) {
 		this.umlDirectory = umlDirectory;
@@ -81,37 +83,29 @@ protected void parseOptionWithArg(String option, String arg) {
         }
     }
     
-    @Override
-    protected void configure() {
-    	super.configure();
-    	this.umlDirectory = "UML";
-    	this.getRootScopeImpl().setLibraryDirectory("Libraries");
-    }
-    
     @Override
     protected void printUsage() {
         this.println("Usage is");
         this.println("  alfc [options] unit");
         this.println("where unit is the qualified name of an Alf unit and");
         this.println("allowable options are:");
         this.println("  -f        Treat unit as a file name rather than a qualifed name");
-        this.println("  -l path   Set library directory path (default is \"Libraries\")");
-        this.println("  -m path   Set model directory path (default is \"Models\")");
+        this.println("  -l path   Set library directory path (default is \"" +
+        							RootNamespaceImpl.DEFAULT_LIBRARY_DIRECTORY + "\")");
+        this.println("  -m path   Set model directory path (default is \"" +
+        							RootNamespaceImpl.DEFAULT_MODEL_DIRECTORY + "\")");
         this.println("  -p        Parse and constraint check only");
         this.println("  -P        Parse, constraint check and print abstract syntax tree");
-        this.println("  -u path   Set UML output directory path (default is \"UML\")");
+        this.println("  -u path   Set UML output directory path (default is \"" +
+        							DEFAULT_UML_DIRECTORY + "\")");
         this.println("  -v        Set verbose mode (if used alone without unit, prints version info)");
     }
     
     public AlfCompiler() {
     	super();
     }
     
-    public AlfCompiler(String[] args) {
-        super(args);
-    }
-    
     public static void main(String[] args) {
-        new AlfCompiler(args);
+        new AlfCompiler().run(args);
     }
 }
diff --git a/org.modeldriven.alf.eclipse/src/org/modeldriven/alf/eclipse/fuml/execution/test/CompileTests.java b/org.modeldriven.alf.eclipse/src/org/modeldriven/alf/eclipse/fuml/execution/test/CompileTests.java
@@ -30,7 +30,7 @@ public static void compileTest(String unitName) {
         
         try {
         	args[args.length-1] = unitName;
-        	new AlfCompiler(args);
+        	new AlfCompiler().run(args);
         } catch (Exception e) {
             e.printStackTrace();
         }
diff --git a/org.modeldriven.alf.fuml.impl/src/org/modeldriven/alf/fuml/impl/execution/Alf.java b/org.modeldriven.alf.fuml.impl/src/org/modeldriven/alf/fuml/impl/execution/Alf.java
@@ -113,15 +113,7 @@ private void createSystemService (
         }
     }
     
-    public Alf() {
-        super();
-    }
-    
-    public Alf(String[] args) {
-        super(args);
-    }
-    
     public static void main(String[] args) {
-        new Alf(args);
+        new Alf().run(args);
     }
 }
diff --git a/org.modeldriven.alf.fuml.impl/src/org/modeldriven/alf/fuml/impl/units/ModelNamespaceImpl.java b/org.modeldriven.alf.fuml.impl/src/org/modeldriven/alf/fuml/impl/units/ModelNamespaceImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright 2013 Ivar Jacobson International SA
+ * Copyright 2016 Data Access Technologies, Inc. (Model Driven Solutions)
  * All rights reserved worldwide. This program and the accompanying materials
  * are made available for use under the terms of the GNU General Public License
  * (GPL) version 3 that accompanies this distribution and is available at     
diff --git a/org.modeldriven.alf.fuml.impl/src/org/modeldriven/alf/fuml/impl/units/RootNamespaceImpl.java b/org.modeldriven.alf.fuml.impl/src/org/modeldriven/alf/fuml/impl/units/RootNamespaceImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright 2015 Data Access Technologies (Model Driven Solutions)
+ * Copyright 2015-2016 Data Access Technologies (Model Driven Solutions)
  * All rights reserved worldwide. This program and the accompanying materials
  * are made available for use under the terms of the GNU General Public License
  * (GPL) version 3 that accompanies this distribution and is available at     
@@ -25,7 +25,6 @@ public class RootNamespaceImpl extends org.modeldriven.alf.fuml.units.RootNamesp
     
 	public RootNamespaceImpl() {
 		super(RootNamespace.getRootScope());
-		super.setLibraryDirectory("Libraries");
 	}
 
     public void setContext(fUML.Syntax.Classes.Kernel.Element contextElement) {
diff --git a/org.modeldriven.alf/dist/alf-base.jar b/org.modeldriven.alf/dist/alf-base.jar
diff --git a/org.modeldriven.alf/src/org/modeldriven/alf/fuml/execution/Alf.java b/org.modeldriven.alf/src/org/modeldriven/alf/fuml/execution/Alf.java
@@ -20,6 +20,7 @@
 import org.modeldriven.alf.fuml.mapping.units.ClassifierDefinitionMapping;
 import org.modeldriven.alf.fuml.mapping.units.DataTypeDefinitionMapping;
 import org.modeldriven.alf.fuml.mapping.units.OperationDefinitionMapping;
+import org.modeldriven.alf.fuml.units.RootNamespaceImpl;
 import org.modeldriven.alf.mapping.Mapping;
 import org.modeldriven.alf.mapping.MappingError;
 import org.modeldriven.alf.syntax.common.ElementReference;
@@ -236,19 +237,13 @@ protected void printUsage() {
         this.println("  -d OFF|FATAL|ERROR|WARN|INFO|DEBUG|ALL");
         this.println("            Set debug logging level (default is as configured)");
         this.println("  -f        Treat unit as a file name rather than a qualifed name");
-        this.println("  -l path   Set library directory path (default is \"Libraries\")");
-        this.println("  -m path   Set model directory path (default is \"Models\")");
+        this.println("  -l path   Set library directory path (default is \"" + 
+                                    RootNamespaceImpl.DEFAULT_LIBRARY_DIRECTORY + "\")");
+        this.println("  -m path   Set model directory path (default is \"" + 
+                                    RootNamespaceImpl.DEFAULT_MODEL_DIRECTORY + "\")");
         this.println("  -p        Parse and constraint check only");
         this.println("  -P        Parse, constraint check and print abstract syntax tree");
         this.println("  -v        Set verbose mode (if used alone without unit, prints version info)");
     }
     
-    public Alf() {
-        super();
-    }
-    
-    public Alf(String[] args) {
-        super(args);
-    }
-    
 }
diff --git a/org.modeldriven.alf/src/org/modeldriven/alf/fuml/execution/AlfBase.java b/org.modeldriven.alf/src/org/modeldriven/alf/fuml/execution/AlfBase.java
@@ -261,9 +261,4 @@ public AlfBase() {
         this.configure();
     }
     
-    public AlfBase(String[] args) {
-        this();
-        this.run(args);
-    }
-    
 }
diff --git a/org.modeldriven.alf/src/org/modeldriven/alf/fuml/execution/AlfCompiler.java b/org.modeldriven.alf/src/org/modeldriven/alf/fuml/execution/AlfCompiler.java
@@ -55,12 +55,4 @@ public UnitDefinition process(UnitDefinition unit) {
         return unit;
     }
     
-    public AlfCompiler() {
-        super();
-    }
-    
-    public AlfCompiler(String[] args) {
-        super(args);
-    }
-    
 }
diff --git a/org.modeldriven.alf/src/org/modeldriven/alf/fuml/units/ModelNamespaceImpl.java b/org.modeldriven.alf/src/org/modeldriven/alf/fuml/units/ModelNamespaceImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright 2011-2013 Data Access Technologies, Inc. (Model Driven Solutions)
+ * Copyright 2011-2016 Data Access Technologies, Inc. (Model Driven Solutions)
  * All rights reserved worldwide. This program and the accompanying materials
  * are made available for use under the terms of the GNU General Public License 
  * (GPL) version 3 that accompanies this distribution and is available at 
@@ -28,7 +28,9 @@
 public class ModelNamespaceImpl extends 
     org.modeldriven.alf.syntax.units.impl.ModelNamespaceImpl {
     
-    private String modelDirectory = "Models";
+    public static final String DEFAULT_MODEL_DIRECTORY = "Models";
+    
+    private String modelDirectory = DEFAULT_MODEL_DIRECTORY;
     protected boolean isVerbose = false;
     
     // Cache ensures that no unit is parsed more than once.
diff --git a/org.modeldriven.alf/src/org/modeldriven/alf/fuml/units/RootNamespaceImpl.java b/org.modeldriven.alf/src/org/modeldriven/alf/fuml/units/RootNamespaceImpl.java
@@ -22,7 +22,12 @@
 import org.modeldriven.alf.syntax.units.UnitDefinition;
 
 public class RootNamespaceImpl extends ModelNamespaceImpl {
-    
+    
+    public static final String ROOT_NAMESPACE_NAME = "Root";
+    public static final String MODEL_NAMESPACE_NAME = "Model";
+    public static final String DEFAULT_LIBRARY_DIRECTORY = "Libraries";
+    public static final String ALF_LIBRARY_SUBDIRECTORY = "alf";
+    
     private ModelNamespace modelNamespace = null;
     private String libraryDirectory = null;
     
@@ -33,8 +38,7 @@ protected RootNamespaceImpl(RootNamespace self) {
     
     public RootNamespaceImpl() {
         this(RootNamespace.getRootScope());
-        this.setName("Root");
-        this.setLibraryDirectory("Libraries");
+        this.setName(ROOT_NAMESPACE_NAME);
         this.resetModelNamespace();
     }
     
@@ -46,7 +50,7 @@ public RootNamespace getSelf() {
     public void resetModelNamespace() {
         ModelNamespace modelNamespace = new ModelNamespace();
         modelNamespace.setImpl(new ModelNamespaceImpl(modelNamespace));
-        modelNamespace.setName("Model");               
+        modelNamespace.setName(MODEL_NAMESPACE_NAME);               
         this.setModelNamespace(modelNamespace);
         this.setMapping(null);
     }
@@ -87,10 +91,13 @@ public String getModelDirectory() {
     
     public void setLibraryDirectory(String libraryDirectory) {
         this.libraryDirectory = libraryDirectory;
-        super.setModelDirectory(libraryDirectory + "/alf");
+        super.setModelDirectory(libraryDirectory + "/" + ALF_LIBRARY_SUBDIRECTORY);
     }
     
     public String getLibraryDirectory() {
+        if (this.libraryDirectory == null) {
+            this.setLibraryDirectory(DEFAULT_LIBRARY_DIRECTORY);
+        }
         return this.libraryDirectory;
     }
     

Original file line number	Diff line number	Diff line change
`@@ -123,15 +123,7 @@ protected void configure() {`
`123`	`123`	`}`
`124`	`124`	`}`
`125`	`125`
`126`		`- public Alf() {`
`127`		`- super();`
`128`		`- }`
`129`		`-`
`130`		`- public Alf(String[] args) {`
`131`		`- super(args);`
`132`		`- }`
`133`		`-`
`134`	`126`	`public static void main(String[] args) {`
`135`		`- new Alf(args);`
	`127`	`+ new Alf().run(args);`
`136`	`128`	`}`
`137`	`129`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public static void compileTest(String unitName) {`
`30`	`30`
`31`	`31`	`try {`
`32`	`32`	`args[args.length-1] = unitName;`
`33`		`- new AlfCompiler(args);`
	`33`	`+ new AlfCompiler().run(args);`
`34`	`34`	`} catch (Exception e) {`
`35`	`35`	`e.printStackTrace();`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -113,15 +113,7 @@ private void createSystemService (`
`113`	`113`	`}`
`114`	`114`	`}`
`115`	`115`
`116`		`- public Alf() {`
`117`		`- super();`
`118`		`- }`
`119`		`-`
`120`		`- public Alf(String[] args) {`
`121`		`- super(args);`
`122`		`- }`
`123`		`-`
`124`	`116`	`public static void main(String[] args) {`
`125`		`- new Alf(args);`
	`117`	`+ new Alf().run(args);`
`126`	`118`	`}`
`127`	`119`	`}`