Raw verification options issues - fix 2046945

src/main/java/net/tapaal/gui/petrinet/dialog/QueryDialog.java

@@ -692,7 +692,7 @@ public static TAPNQuery showQueryDialogue(QueryDialogueOption option, TAPNQuery
 			return null;
 		}
 		guiDialog = new EscapableDialog(TAPAALGUI.getApp(),	"Edit Query", true);
-
+        
         Container contentPane = guiDialog.getContentPane();
 
         // 1 Set layout
@@ -822,10 +822,15 @@ private void updateQueryButtonsAccordingToSelection() {
         int selectedIndex = queryType.getSelectedIndex();
         if (current instanceof LTLANode || current instanceof LTLENode ||
             ((selectedIndex == 1 || selectedIndex == 2) && current instanceof TCTLPathPlaceHolder)) {
+            disjunctionButton.setEnabled(true);
+            conjunctionButton.setEnabled(true);
             negationButton.setEnabled(false);
         } else if (!lens.isGame()) {
+            disjunctionButton.setEnabled(true);
+            conjunctionButton.setEnabled(true);
             negationButton.setEnabled(true);
         }
+
         if (lens.isGame()) {
             if (newProperty instanceof TCTLAbstractPathProperty && !(newProperty instanceof TCTLPathPlaceHolder)) {
                 enableOnlyStateButtons();
@@ -1527,8 +1532,10 @@ private void init(QueryDialogueOption option, final TAPNQuery queryToCreateFrom)
         initRawVerificationOptionsPanel();
         initButtonPanel(option);
 
-        if(queryToCreateFrom != null) {
+        if (queryToCreateFrom != null) {
             setupFromQuery(queryToCreateFrom);
+        } else {
+            setupRawVerificationOptionsFromQuery();
         }
 
         refreshTraceOptions();
@@ -1546,7 +1553,6 @@ private void init(QueryDialogueOption option, final TAPNQuery queryToCreateFrom)
         refreshUndoRedo();
 
         setEnabledOptionsAccordingToCurrentReduction();
-        //setVerificationOptionsEnabled(!queryToCreateFrom.getRawVerification());
 
         makeShortcuts();
 
@@ -1589,6 +1595,11 @@ private void setupRawVerificationOptionsFromQuery(TAPNQuery queryToCreateFrom) {
         rawVerificationOptionsTextField.setText(queryToCreateFrom.getRawVerificationPrompt());
     }
 
+    private void setupRawVerificationOptionsFromQuery() {
+        rawVerificationOptionsEnabled.setSelected(false);
+        rawVerificationOptionsTextField.setText("-x 1 ");
+    }
+
     private void setupTraceListFromQuery(TAPNQuery queryToCreateFrom) {
         // First remove all elements (removes the default trace that was added)
         traceModel.removeAllElements();
@@ -4526,7 +4537,11 @@ private void initRawVerificationOptionsPanel() {
         rawVerificationOptionsTextField = new JTextField();
         rawVerificationOptionsTextField.setEnabled(false);
         rawVerificationOptionsTextField.setToolTipText(TOOL_TIP_RAW_VERIFICATION_TEXT_FIELD);
-
+
+        Dimension dim = new Dimension(200, 20);
+        rawVerificationOptionsTextField.setPreferredSize(dim);
+        rawVerificationOptionsTextField.setMaximumSize(dim);
+
         rawVerificationOptionsHelpButton = new JButton("Help on options");
         rawVerificationOptionsHelpButton.setEnabled(false);
         rawVerificationOptionsHelpButton.setToolTipText(TOOL_TIP_RAW_VERIFICATION_HELP_BUTTON);
@@ -4635,10 +4650,10 @@ private void setAllEnabled(Container container, boolean isEnabled) {
 
     protected void setEnabledOptionsAccordingToCurrentReduction() {
         if (rawVerificationOptionsEnabled.isSelected()) {
+            refreshQueryEditingButtons();
             return;
         }
 
-        refreshQueryEditingButtons();
         refreshTraceOptions();
         if (lens.isTimed()) {
             refreshSymmetryReduction();