Merge pull request #367 from bjoernranft/form-gui-sync-fix

trac#34161 form-gui sync to document.

Author: ilhany359

core/src/main/java/de/muenchen/allg/itd51/wollmux/db/ColumnTransformer.java

@@ -134,7 +134,7 @@ public String get(String columnName, Dataset ds) throws ColumnNotFoundException
     if (func == null) {
       return ds.get(columnName);
     }
-    return func.getString(new DatasetValues(ds));
+    return func.getResult(new DatasetValues(ds));
   }
 
   /**

core/src/main/java/de/muenchen/allg/itd51/wollmux/document/DocumentManager.java

@@ -98,18 +98,19 @@ public class DocumentManager
   private DocumentManager() {
     registeredDocumentEventListener = new ArrayList<>();
   }
-
+  
   /**
    * Fügt compo den gemanageten Objekten hinzu, wobei die für Textdokumente
    * relevanten Informationen hinterlegt werden.
    */
-  public synchronized void addTextDocument(XTextDocument compo)
+  public void addTextDocument(XTextDocument compo)
   {
     TextDocumentInfo docInfo = new TextDocumentInfo(compo);
     info.put(new HashableComponent(compo), docInfo);
+      
     new OnTextDocumentControllerInitialized(docInfo.getTextDocumentController()).emit();
   }
-
+  
   public Map<HashableComponent, Info> getTextDocumentList() {
     return info;
   }

core/src/main/java/de/muenchen/allg/itd51/wollmux/document/TextDocumentController.java

@@ -69,8 +69,6 @@
 import de.muenchen.allg.itd51.wollmux.form.control.FormController;
 import de.muenchen.allg.itd51.wollmux.form.model.FormModel;
 import de.muenchen.allg.itd51.wollmux.form.model.FormModelException;
-import de.muenchen.allg.itd51.wollmux.form.model.FormValueChangedListener;
-import de.muenchen.allg.itd51.wollmux.form.model.VisibilityChangedListener;
 import de.muenchen.allg.itd51.wollmux.func.Function;
 import de.muenchen.allg.itd51.wollmux.func.FunctionFactory;
 import de.muenchen.allg.itd51.wollmux.func.FunctionLibrary;
@@ -85,7 +83,7 @@
 /**
  * Controller of the document.
  */
-public class TextDocumentController implements FormValueChangedListener, VisibilityChangedListener
+public class TextDocumentController
 {
 
   private static final Logger LOGGER = LoggerFactory.getLogger(TextDocumentController.class);
@@ -465,7 +463,7 @@ public int evaluateDocumentActions(Iterator<Function> funcs)
     while (funcs.hasNext())
     {
       Function f = funcs.next();
-      String res = f.getString(values);
+      String res = f.getResult(values);
       if (res.length() > 0)
       {
         if ("noaction".equals(res))
@@ -790,7 +788,7 @@ public String getTransformedValue(String trafoName, String value)
         String[] pars = func.parameters();
         for (int i = 0; i < pars.length; i++)
           args.put(pars[i], value);
-        transformed = func.getString(args);
+        transformed = func.getResult(args);
       } else
       {
         transformed = L.m("<FEHLER: TRAFO '%1' nicht definiert>", trafoName);
@@ -819,7 +817,7 @@ private String getTransformedValue(String trafoName, Map<String, String> mapIdTo
       String[] pars = func.parameters();
       for (int i = 0; i < pars.length; i++)
         args.put(pars[i], mapIdToValues.get(pars[i]));
-      return func.getString(args);
+      return func.getResult(args);
     } else
     {
       LOGGER.error("Die TRAFO '{}' ist nicht definiert.", trafoName);
@@ -1091,7 +1089,7 @@ public void updateFormFields(String fieldId)
    * @param visible
    *          If true shows the elements, otherwise hides the elements.
    */
-  public synchronized void setVisibleState(String groupId, boolean visible)
+  public void setVisibleState(String groupId, boolean visible)
   {
     try
     {
@@ -1828,27 +1826,10 @@ public FormModel getFormModel() throws FormModelException
     if (formModel == null)
     {
       formModel = new FormModel(getFormConfig(), getFunctionContext(), getFunctionLibrary(), getDialogLibrary(),
-          getIDToPresetValue());
+          getIDToPresetValue(), this);
       boolean modified = model.isDocumentModified();
       model.setDocumentModifiable(false);
-      formModel.notifyWithCurrentValues(new FormValueChangedListener()
-      {
-
-        @Override
-        public void valueChanged(String id, String value)
-        {
-          addFormFieldValue(id, value);
-        }
-
-        @Override
-        public void statusChanged(String id, boolean okay)
-        {
-          // nothing to do
-        }
-      });
       formModel.notifyWithCurrentVisibilites(this::setVisibleState);
-      formModel.addFormModelChangedListener(this, false);
-      formModel.addVisibilityChangedListener(this, false);
       model.setDocumentModified(modified);
       model.setDocumentModifiable(true);
     }
@@ -1949,15 +1930,12 @@ public void setDefaultWindowAttributes(String value)
    * @param value
    *          The new value of the form field.
    */
-  @Override
-  public void valueChanged(String id, String value)
-  {
+  public void setValueChanged(String id, String value) {
     if (!id.isEmpty())
     {
       new OnFormValueChanged(this, id, value).emit();
     }
   }
-
   /**
    * Set the visibility of a group.
    *
@@ -1966,15 +1944,9 @@ public void valueChanged(String id, String value)
    * @param visible
    *          True if the group should be visible, false otherwise.
    */
-  @Override
-  public void visibilityChanged(String groupId, boolean visible)
+  public void setVisibilityChanged(String groupId, boolean visible)
   {
     new OnSetVisibleState(this, groupId, visible, null).emit();
   }
-
-  @Override
-  public void statusChanged(String id, boolean okay)
-  {
-    // nothing to do here, only for form gui.
-  }
+  
 }

core/src/main/java/de/muenchen/allg/itd51/wollmux/document/TextDocumentModel.java

@@ -175,7 +175,7 @@ public class TextDocumentModel
   /**
    * Cache of fragment URLS of an openTemplate command.
    */
-  private volatile String[] fragUrls;
+  private String[] fragUrls;
 
   /**
    * True if this document is a template or should be treated as template.
@@ -197,12 +197,12 @@ public class TextDocumentModel
   /**
    * The print functions specified for the document.
    */
-  private volatile Set<String> printFunctions;
+  private Set<String> printFunctions;
 
   /**
    * The form description or null if not yet read.
    */
-  private volatile ConfigThingy formularConf;
+  private ConfigThingy formularConf;
 
   /**
    * Mapping from field id to form value.
@@ -217,7 +217,7 @@ public class TextDocumentModel
   /**
    * The document commands.
    */
-  private volatile DocumentCommands documentCommands;
+  private DocumentCommands documentCommands;
 
   /**
    * Mapping from visibility group names to their visibility state.
@@ -232,7 +232,7 @@ public class TextDocumentModel
   /**
    * Null or the configuration of a mail merge.
    */
-  private volatile ConfigThingy mailmergeConf;
+  private ConfigThingy mailmergeConf;
 
   /**
    * Has the version info been updated?
@@ -390,7 +390,7 @@ public synchronized DocumentCommands getDocumentCommands()
     return documentCommands;
   }
 
-  public synchronized void setIDToFormFields(Map<String, List<FormField>> idToFormFields)
+  public void setIDToFormFields(Map<String, List<FormField>> idToFormFields)
   {
     this.idToFormFields = idToFormFields;
   }
@@ -551,15 +551,15 @@ public void importFormValues(File file) throws IOException
     String data = new String(Files.readAllBytes(file.toPath()));
     parseFormValues(data);
   }
-
+  
   /**
    * Parses the string as {@link ConfigThingy} of the form "WM(FormularWerte(...))" and adds the
    * values to {@link #formFieldValues}.
    *
    * @param werteStr
    *          The string defining the form values. If null nothing is done.
    */
-  private void parseFormValues(String werteStr)
+  public void parseFormValues(String werteStr)
   {
     if (werteStr == null)
     {
@@ -695,7 +695,7 @@ public synchronized boolean hasURL()
    *
    * @return True if the document has a form description with a defined form GUI, false otherwise.
    */
-  public synchronized boolean hasFormGUIWindow()
+  public boolean hasFormGUIWindow()
   {
     try
     {
@@ -842,7 +842,7 @@ public synchronized SetJumpMark getFirstJumpMark()
    *
    * @return A set of field IDs.
    */
-  public synchronized Set<String> getAllFieldIDs()
+  public Set<String> getAllFieldIDs()
   {
     HashSet<String> ids = new HashSet<>();
     ids.addAll(idToFormFields.keySet());
@@ -908,7 +908,7 @@ public synchronized boolean hasSelection()
    *
    * @return The form description.
    */
-  public synchronized ConfigThingy getFormDescription()
+  public ConfigThingy getFormDescription()
   {
     if (formularConf == null)
     {
@@ -984,7 +984,7 @@ public ConfigThingy getFunktionenConf()
    * @param fieldId
    *          The ID of the field to focus.
    */
-  public synchronized void focusFormField(String fieldId)
+  public void focusFormField(String fieldId)
   {
     FormField field;
     List<FormField> formFields = getIdToTextFieldFormFields().get(fieldId);
@@ -1512,7 +1512,7 @@ public static String getDocumentCommandByBookmarkName(String bookmarkName)
    *          Don't collect information about the fields with an ID in this set.
    * @return Array of information per field ordered alphabetically.
    */
-  public synchronized ReferencedFieldID[] getReferencedFieldIDsThatAreNotInSchema(Set<String> blacklist)
+  public ReferencedFieldID[] getReferencedFieldIDsThatAreNotInSchema(Set<String> blacklist)
   {
     ArrayList<ReferencedFieldID> list = new ArrayList<>();
 

core/src/main/java/de/muenchen/allg/itd51/wollmux/document/commands/OnProcessTextDocument.java

@@ -73,27 +73,24 @@ public void onTextDocumentControllerInitialized(OnTextDocumentControllerInitiali
       // configuration for Fenster isn't mandatory
     }
 
-    DocumentCommandInterpreter dci = new DocumentCommandInterpreter(
-        documentController, WollMuxFiles.isDebugMode());
+    DocumentCommandInterpreter dci = new DocumentCommandInterpreter(documentController, WollMuxFiles.isDebugMode());
 
     try
     {
       // scan global document commands
       dci.scanGlobalDocumentCommands();
 
-      int actions = documentController.evaluateDocumentActions(GlobalFunctions
-          .getInstance().getDocumentActionFunctions().iterator());
+      int actions = documentController
+          .evaluateDocumentActions(GlobalFunctions.getInstance().getDocumentActionFunctions().iterator());
 
       // if it is a template execute the commands
-      if ((actions < 0 && documentController.getModel().isTemplate())
-          || (actions == Integer.MAX_VALUE))
+      if ((actions < 0 && documentController.getModel().isTemplate()) || (actions == Integer.MAX_VALUE))
       {
         dci.executeTemplateCommands();
 
         // there can be new commands now
         dci.scanGlobalDocumentCommands();
       }
-      dci.scanInsertFormValueCommands();
 
     } catch (java.lang.Exception e)
     {

core/src/main/java/de/muenchen/allg/itd51/wollmux/event/handlers/OnActivateSidebar.java

@@ -89,7 +89,7 @@ private void activateSidebarPanel(XController2 controller, String deckName)
     try
     {
       XDeck deck = UnoSidebar.getDeckByName(deckName, controller);
-      if (deck != null)
+      if (deck != null && !deck.isActive())
       {
         deck.activate(true);
       }

core/src/main/java/de/muenchen/allg/itd51/wollmux/event/handlers/OnSaveAs.java

@@ -123,7 +123,7 @@ private File getDefaultFile(Function func)
         value = "";
       values.put(par, value);
     }
-    String filename = func.getString(values);
+    String filename = func.getResult(values);
     File f = new File(filename);
     if (f.isAbsolute())
       return f;

core/src/main/java/de/muenchen/allg/itd51/wollmux/event/handlers/OnTextDocumentControllerInitialized.java

@@ -36,7 +36,7 @@
  */
 public class OnTextDocumentControllerInitialized extends WollMuxEvent
 {
-  private final TextDocumentController documentController;
+  private TextDocumentController documentController;
 
   /**
    * Handled if TextDocumentController is initialized.

core/src/main/java/de/muenchen/allg/itd51/wollmux/event/handlers/WollMuxEvent.java

@@ -91,6 +91,7 @@ protected void errorMessage(Throwable t)
      */
     if (t.getCause() instanceof RuntimeException)
     {
+      LOGGER.error("", t);
       return;
     }
 

core/src/main/java/de/muenchen/allg/itd51/wollmux/form/model/Control.java

@@ -282,7 +282,7 @@ public void computeNewValues(String value, SimpleMap values, SimpleMap modified)
   public String computeValue(SimpleMap values)
   {
     if (autofill.isPresent())
-      return autofill.get().getString(values);
+      return autofill.get().getResult(values);
     else if (type == UIElementType.COMBOBOX && !options.isEmpty())
       return options.get(0);
     else