X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Tools%2FSource%2FFrameworkWizard%2Fsrc%2Forg%2Ftianocore%2Fframeworkwizard%2Fpackaging%2Fui%2FSpdMsaFiles.java;h=efaf0ef53fcff072776094b3a0519974a29262c4;hp=c53e082e1f68b5a77381587fa8ed10ba6440a190;hb=04a13d6c501bd4b70331a11a88d480bb254a3693;hpb=d6d24759a0c47633e30acbda45a0d899764e4610

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdMsaFiles.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdMsaFiles.java
index c53e082e1f..efaf0ef53f 100644
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdMsaFiles.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdMsaFiles.java
@@ -64,7 +64,7 @@ public class SpdMsaFiles extends IInternalFrame implements TableModelListener{
 
     private JPanel jContentPane = null;
 
-    private JScrollPane jScrollPane1 = null;
+    private JScrollPane jScrollPaneMsa = null;
 
     private JButton jButtonAdd = null;
 
@@ -105,13 +105,13 @@ public class SpdMsaFiles extends IInternalFrame implements TableModelListener{
       	
       @return javax.swing.JScrollPane	
      **/
-    private JScrollPane getJScrollPane1() {
-        if (jScrollPane1 == null) {
-            jScrollPane1 = new JScrollPane();
-            jScrollPane1.setBounds(new java.awt.Rectangle(13,177,461,139));
-            jScrollPane1.setViewportView(getJTable());
+    private JScrollPane getJScrollPaneMsa() {
+        if (jScrollPaneMsa == null) {
+            jScrollPaneMsa = new JScrollPane();
+            jScrollPaneMsa.setBounds(new java.awt.Rectangle(13,177,461,421));
+            jScrollPaneMsa.setViewportView(getJTable());
         }
-        return jScrollPane1;
+        return jScrollPaneMsa;
     }
 
     /**
@@ -308,7 +308,7 @@ public class SpdMsaFiles extends IInternalFrame implements TableModelListener{
             jContentPane.setLayout(null);
             jContentPane.add(jLabel, null);
             jContentPane.add(jStarLabel2, null);
-            jContentPane.add(getJScrollPane1(), null);
+            jContentPane.add(getJScrollPaneMsa(), null);
             jContentPane.add(getJButtonAdd(), null);
             jContentPane.add(getJButtonRemove(), null);
             jContentPane.add(getJButtonClearAll(), null);
@@ -333,7 +333,6 @@ public class SpdMsaFiles extends IInternalFrame implements TableModelListener{
      */
     public void actionPerformed(ActionEvent arg0) {
         
-        docConsole.setSaved(false);
         if (arg0.getSource() == jButtonOk) {
             this.save();
             this.dispose();
@@ -350,8 +349,16 @@ public class SpdMsaFiles extends IInternalFrame implements TableModelListener{
                 JOptionPane.showMessageDialog(this, "Msa File is NOT PathAndFilename type.");
                 return;
             }
+            
+            String dirPrefix = Tools.dirForNewSpd.substring(0, Tools.dirForNewSpd.lastIndexOf(File.separator));
+            if (!new File(dirPrefix + File.separator + jTextField.getText()).exists()) {
+                JOptionPane.showMessageDialog(this, "File NOT Exists in Current Package.");
+                return;
+            }
             model.addRow(row);
+            jTable.changeSelection(model.getRowCount()-1, 0, false, false);
             sfc.genSpdMsaFiles(row[0], null, null, null);
+            docConsole.setSaved(false);
         }
         //
         // remove selected line
@@ -364,6 +371,7 @@ public class SpdMsaFiles extends IInternalFrame implements TableModelListener{
             if (rowSelected >= 0) {
                 model.removeRow(rowSelected);
                 sfc.removeSpdMsaFile(rowSelected);
+                docConsole.setSaved(false);
             }
         }
 
@@ -373,6 +381,7 @@ public class SpdMsaFiles extends IInternalFrame implements TableModelListener{
             }
             model.setRowCount(0);
             sfc.removeSpdMsaFile();
+            docConsole.setSaved(false);
         }
 
     }
@@ -380,8 +389,21 @@ public class SpdMsaFiles extends IInternalFrame implements TableModelListener{
     public void tableChanged(TableModelEvent arg0) {
         // TODO Auto-generated method stub
         int row = arg0.getFirstRow();
+        int column = arg0.getColumn();
         TableModel m = (TableModel)arg0.getSource();
         if (arg0.getType() == TableModelEvent.UPDATE){
+            String[] sa = new String[1];
+            sfc.getSpdMsaFile(sa, row);
+            Object cellData = m.getValueAt(row, column);
+            if (cellData == null) {
+                cellData = "";
+            }
+            if (cellData.equals(sa[column])) {
+                return;
+            }
+            if (cellData.toString().length() == 0 && sa[column] == null) {
+                return;
+            }
             String file = m.getValueAt(row, 0) + "";
             if (file.length() == 0) {
                 JOptionPane.showMessageDialog(this, "Msa File is NOT PathAndFilename type.");
@@ -471,9 +493,9 @@ public class SpdMsaFiles extends IInternalFrame implements TableModelListener{
     public void componentResized(ComponentEvent arg0) {
         int intPreferredWidth = 500;
         
-        resizeComponentWidth(this.jScrollPane1, this.getWidth(), intPreferredWidth);
-        resizeComponentWidth(this.jTextField, this.getWidth(), intPreferredWidth);
-        relocateComponentX(this.jButtonBrowse, this.getWidth(), this.getPreferredSize().width, 25);
+        Tools.resizeComponentWidth(this.jScrollPaneMsa, this.getWidth(), intPreferredWidth);
+        Tools.resizeComponentWidth(this.jTextField, this.getWidth(), intPreferredWidth);
+        Tools.relocateComponentX(this.jButtonBrowse, this.getWidth(), this.getPreferredSize().width, 25);
     }
     
     public static void main(String[] args){