installed the config of ArightFlagDeps; added small change to UpidAssist

git-svn-id: http://repo.nplusc.de/svn/iZink@58 8b19561d-0d00-6744-8ac1-9afc8f58a8aa

UpidTK/src/de/nplusc/upidgen/ArightsFlagDependencys.java

@@ -195,7 +195,7 @@ public class ArightsFlagDependencys extends javax.swing.JFrame
                 Tools.DebugHelperPrint(flagName1+"|flagname1|"+flagName2+"|flagname2", true, "UpidTK.enableDebug");
         if(FlagVal.equals(availFlagVals[0]))
         {
-            dbc.write("DELETE FROM 'flagdep' WHERE flag="+flagID1+" AND depflag = "+flagID2);
+            dbc.write("DELETE FROM flagdep WHERE flag="+flagID1+" AND depflag = "+flagID2);
         }
         String updootQuery = "";
         boolean ColumnIsFilled = !((m.getValueAt(x, y)+"").equals(""));
@@ -205,7 +205,7 @@ public class ArightsFlagDependencys extends javax.swing.JFrame
             {
                 updootQuery="UPDATE flagdep " +
                 "SET inverted=0" +
-                "WHERE flag="+flagID1+" AND depflag = "+flagID2;
+                "WHERE flag="+flagID1+" AND depflag="+flagID2;
             }
             else
             {
@@ -225,7 +225,8 @@ public class ArightsFlagDependencys extends javax.swing.JFrame
                 updootQuery = "Insert into flagdep values(NULL,"+flagID1+","+flagID2+",+1)";
             }
         }
-        dbc.write(updootQuery);
+        if(!updootQuery.equals(""))
+            dbc.write(updootQuery);
         fetch();
     }
     
@@ -339,13 +340,13 @@ public class ArightsFlagDependencys extends javax.swing.JFrame
       //  {
       //      insertColumn(CatDefine[i][1]);
       //  }
-        for (int i = 0; i < Linkage.length; i++)
+        /* for (int i = 0; i < Linkage.length; i++)
         {
             String[] link = Linkage[i];
             Tools.DebugHelperPrint(link[0] + "|" + link[1] + "|" + link[2], true, "UpidTK.enableDebug");
             insertValueToTable("X", Integer.valueOf(link[1]) - 1, Integer.valueOf(link[2]) + 1);
 
-        }
+        }*/
         String[][] definitions = dbc.queryTable("Select flag , depflag , inverted from flagdep", 3);
         for (String[] row : definitions)
         {
@@ -354,7 +355,7 @@ public class ArightsFlagDependencys extends javax.swing.JFrame
             {
                 RowString =  availFlagVals[2];
             }
-            insertValueToTable(RowString,Integer.valueOf(row[0]), Integer.valueOf(row[1]));
+            insertValueToTable(RowString,Integer.valueOf(row[0])-1, Integer.valueOf(row[1])+1);
         }
 
     }

UpidTK/src/de/nplusc/upidgen/UPIDAssistant.form

@@ -10,6 +10,7 @@
   </Properties>
   <SyntheticProperties>
     <SyntheticProperty name="formSizePolicy" type="int" value="1"/>
+    <SyntheticProperty name="generateCenter" type="boolean" value="false"/>
   </SyntheticProperties>
   <AuxValues>
     <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="0"/>

UpidTK/src/de/nplusc/upidgen/UPIDAssistant.java

@@ -53,6 +53,8 @@ public class UPIDAssistant extends javax.swing.JFrame
         txfManualInput.setVisible(false);
         lstOpt.setVisible(true);
         lblMsg.setVisible(false);
+        progressOfAssist.setMinimum(0);
+        progressOfAssist.setMaximum(5);
     }
     
     public HashMap<String,String> getMfids()
@@ -380,13 +382,16 @@ public class UPIDAssistant extends javax.swing.JFrame
     }
     private void btnContinueActionPerformed(java.awt.event.ActionEvent evt)//GEN-FIRST:event_btnContinueActionPerformed
     {//GEN-HEADEREND:event_btnContinueActionPerformed
+        
         if(stage==0)
         {
+            progressOfAssist.setValue(1);
             MFID = ((String)lstOpt.getSelectedValue()).substring(0,4);
 
         }
         if(stage==1)
         {
+            progressOfAssist.setValue(2);
             if(freetype)
             {
                 PSC=txfManualInput.getText().substring(0,2);
@@ -398,13 +403,14 @@ public class UPIDAssistant extends javax.swing.JFrame
         }
         if(stage==2)
         {
+            progressOfAssist.setValue(3);
             UPID6=txfManualInput.getText().substring(0,6);
         }
         
         if(stage==3)
         {
             zsc=slZSC.getValue();
-            
+            progressOfAssist.setValue(4);
         }
         if(stage==4)
         {