Changeset 390

Timestamp:

07/28/10 15:33:37 (2 years ago)

Author:

ke

Message:

Set verbose flags back to false.

Files:

• kahina/trunk/src/org/kahina/core/KahinaInstance.java (modified) (1 diff)
• kahina/trunk/src/org/kahina/core/gui/KahinaGUI.java (modified) (6 diffs)
• kahina/trunk/src/org/kahina/core/io/magazine/ObjectMagazine.java (modified) (1 diff)
• kahina/trunk/src/org/kahina/tralesld/TraleSLDRunner.java (modified) (2 diffs)

kahina/trunk/src/org/kahina/core/KahinaInstance.java

@@ -39 +39 @@
-public abstract class KahinaInstance<S extends KahinaState, G extends KahinaGUI, B extends KahinaBridge> implements KahinaListener
-{
-tru
+fals
-        
-        protected S state;

kahina/trunk/src/org/kahina/core/gui/KahinaGUI.java

@@ -38 +38 @@
-public class KahinaGUI implements KahinaListener
-{
-verbose = tru
+VERBOSE = fals
-
-        protected KahinaInstance<?, ?, ?> kahina;
@@ -62 +62 @@
-        public KahinaGUI(Class<? extends KahinaStep> stepType, KahinaInstance<?, ?, ?> kahina)
-        {
-verbose
+VERBOSE
-                {
-                        System.err.println("creating Kahina GUI...");
@@ -102 +102 @@
-        protected void fillFieldToView(Class<? extends KahinaStep> stepType)
-        {
-verbose
+VERBOSE
-                {
-                        System.err.println("Generating views for step fields:");
@@ -108 +108 @@
-                for (Field field : stepType.getFields())
-                {
-verbose
+VERBOSE
-                        {
-                                System.err.println("\tfield: " + field.getName() + "\n\t\tclass: " + field.getType());
@@ -116 +116 @@
-                                KahinaView<?> newView = KahinaViewRegistry.generateViewFor(field.getType());
-                                KahinaRunner.getControl().registerListener("update", newView);
-verbose
+VERBOSE
-                                {
-                                        System.err.println("\t\tview: " + newView);
@@ -230 +230 @@
-            if (stepID != -1)
-            {
-verbose
+VERBOSE
-                {
-                        System.err.println("Updating selection to step " + stepID);

kahina/trunk/src/org/kahina/core/io/magazine/ObjectMagazine.java

@@ -25 +25 @@
-public class ObjectMagazine<S>
-{
-tru
+fals
-
-        private final File folder;

kahina/trunk/src/org/kahina/tralesld/TraleSLDRunner.java

@@ -1 +1 @@
-package org.kahina.tralesld;
-
+import java.io.File;
+
-import org.kahina.core.KahinaRunner;
+import org.kahina.core.event.KahinaSessionEvent;
-import org.kahina.tralesld.bridge.TraleSLDBridge;
-
-public class TraleSLDRunner extends KahinaRunner
-{
-        public static void main(String[] args)
-        {
-                TraleSLDBridge bridge = runAndGetBridge();
-                bridge.initializeParseTrace("[she,thinks,she,gives,her,milk]");
-                bridge.registerChartEdge(0, 5, 6, "lexicon");
-                bridge.registerStepInformation(1, "rule_close", "close chart edge under rule application");
-                bridge.registerStepLocation(1, 0);
-                bridge.registerRuleApplication(2, "subject_head_rule", 0, "apply rule, subject_head_rule"); // TODO
-                bridge.registerStepSourceCodeLocation(2, "/home/johannes/pro/kahina/trale/test_gram/theory3.pl", 185);
-                bridge.registerStepLocation(2, 1);
-                bridge.registerEdgeRetrieval(0);
-                bridge.registerStepInformation(3, "unify(Subj)", "unify edge with Subj");
-                bridge.registerStepSourceCodeLocation(3, "/home/johannes/pro/kahina/trale/test_gram/theory3.pl", 191);
-                bridge.registerStepLocation(3, 2);
-                bridge.registerStepInformation(4, "type(edge,bot)", "add type, bot, to edge");
-                bridge.registerStepLocation(4, 3);
-                bridge.registerStepExit(4, true);
-                bridge.registerStepExit(3, true);
-                bridge.registerStepInformation(5, "featval(edge:phon)", "enforce description on phon value of edge");
-                bridge.registerStepSourceCodeLocation(5, "/home/johannes/pro/kahina/trale/test_gram/theory3.pl", 191);
-                bridge.registerStepLocation(5, 2);
-                bridge.registerStepInformation(6, "unify(SubjPhon)", "unify value at phon with SubjPhon");
-                bridge.registerStepSourceCodeLocation(6, "/home/johannes/pro/kahina/trale/test_gram/theory3.pl", 191);
-                bridge.registerStepLocation(6, 5);
-                bridge.registerStepInformation(7, "type(phon,ne_list)", "add type, ne_list, to value at phon");
-                bridge.registerStepLocation(7, 6);
-                bridge.registerStepExit(7, true);
-                bridge.registerStepExit(6, true);
-                bridge.registerStepExit(5, true);
-                bridge.registerStepFailure(2);
-                bridge.registerRuleApplication(8, "head_complement_rule", 0, "apply rule, head_complement_rule");
-                bridge.registerStepSourceCodeLocation(8, "/home/johannes/pro/kahina/trale/test_gram/theory3.pl", 195);
-                bridge.registerStepLocation(8, 1);
-                bridge.registerEdgeRetrieval(0);
-                bridge.registerStepInformation(9, "unify(Head)", "unify edge with Head");
-                bridge.registerStepSourceCodeLocation(9, "/home/johannes/pro/kahina/trale/test_gram/theory3.pl", 201);
-                bridge.registerStepLocation(9, 8);
-                bridge.registerStepInformation(10, "type(edge,bot)", "add type, bot, to edge");
-                bridge.registerStepLocation(10, 9);
-        }
-
-        public static void initialize()
@@ -68 +31 @@
-                }
-        }
+
+        private static void runWithoutBridge(File savedSession)
+        {
+                try
+                {
+                        initialize();
+                        TraleSLDInstance kahina = new TraleSLDInstance();
+                        kahina.getGUI().prepare();
+                        kahina.getGUI().buildAndShow();
+                        if (savedSession != null)
+                        {
+                                KahinaRunner.processEvent(new KahinaSessionEvent(KahinaSessionEvent.LOAD_SESSION, savedSession));
+                        }
+                } catch (Exception e)
+                {
+                        e.printStackTrace();
+                        System.exit(-1);
+                }
+        }
+        
+        public static void main(String[] args)
+        {
+                File savedSession = null;
+                if (args.length > 0)
+                {
+                        savedSession = new File(args[0]);
+                }
+                runWithoutBridge(savedSession);
+        }
-}