Merge branch 'master' into highprecision

nickbattle · Nov 30, 2023 · bf27f29 · bf27f29
2 parents d27ff5f + f307195
commit bf27f29
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 10 deletions.
diff --git a/vdmj/documentation/DesignSpec.odt b/vdmj/documentation/DesignSpec.odt
diff --git a/vdmj/documentation/DesignSpec.pdf b/vdmj/documentation/DesignSpec.pdf
diff --git a/vdmj/documentation/PluginWritersGuide.odt b/vdmj/documentation/PluginWritersGuide.odt
diff --git a/vdmj/documentation/PluginWritersGuide.pdf b/vdmj/documentation/PluginWritersGuide.pdf
diff --git a/vdmj/src/main/java/com/fujitsu/vdmj/plugins/Lifecycle.java b/vdmj/src/main/java/com/fujitsu/vdmj/plugins/Lifecycle.java
@@ -146,8 +146,6 @@ else if (argv.contains("-vdmrt"))
 
 	private void usage()
 	{
-		List<AnalysisPlugin> plugins = PluginRegistry.getInstance().getPlugins();
-
 		println("Usage: VDMJ [-vdmsl | -vdmpp | -vdmrt] [<options>] [<files or dirs>]");
 		println("-vdmsl: parse files as VDM-SL (default)");
 		println("-vdmpp: parse files as VDM++");
@@ -161,10 +159,7 @@ private void usage()
 		println("-q: suppress information messages");
 		println("-verbose: display detailed startup information");
 
-		for (AnalysisPlugin plugin: plugins)
-		{
-			plugin.usage();
-		}
+		PluginRegistry.getInstance().usage();
 
 		System.exit(0);
 	}
@@ -268,10 +263,7 @@ protected void processArgs()
 			}
 		}
 
-		for (AnalysisPlugin plugin: PluginRegistry.getInstance().getPlugins())
-		{
-			plugin.processArgs(argv);	// In priority order
-		}
+		PluginRegistry.getInstance().processArgs(argv);	// In priority order
 	}
 
 	protected void loadPlugins()

diff --git a/vdmj/src/main/java/com/fujitsu/vdmj/plugins/PluginRegistry.java b/vdmj/src/main/java/com/fujitsu/vdmj/plugins/PluginRegistry.java
@@ -97,6 +97,22 @@ public List<AnalysisPlugin> getPlugins()
 		return sorted;
 	}
 
+	public void usage()
+	{
+		for (AnalysisPlugin plugin: getPlugins())
+		{
+			plugin.usage();
+		}
+	}
+
+	public void processArgs(List<String> argv)
+	{
+		for (AnalysisPlugin plugin: getPlugins())
+		{
+			plugin.processArgs(argv);	// In priority order
+		}
+	}
+
 	public AnalysisCommand getCommand(String line)
 	{
 		String[] argv = line.split("\\s+");