p.addNewPackageName().setStringValue(name);\r
p.addNewGuid().setStringValue(guid);\r
p.addNewVersion().setStringValue(version);\r
- p.addNewPath().setStringValue(installDir);\r
+ p.addNewPath().setStringValue(installDir + "/");\r
\r
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");\r
Date date = new Date();\r
import java.io.File;\r
\r
import javax.swing.JButton;\r
+import javax.swing.filechooser.FileFilter;\r
\r
/**\r
GUI for create spd file\r
@return javax.swing.JButton \r
**/\r
private JButton getJButton() {\r
+ final FileFilter filter = new PkgFileFilter("spd");\r
+ \r
if (jButton == null) {\r
jButton = new JButton();\r
jButton.setText("Save");\r
//\r
// save sfc contents to file\r
//\r
- JFileChooser chooser = new JFileChooser(System.getenv("WORKSPACE"));\r
+ JFileChooser chooser = new JFileChooser(PackagingMain.dirForNewSpd);\r
chooser.setMultiSelectionEnabled(false);\r
+ chooser.setFileFilter(filter);\r
\r
int retval = chooser.showSaveDialog(frame);\r
if (retval == JFileChooser.APPROVE_OPTION) {\r
if (jRadioButtonSelect.isSelected()) {\r
strLibClass = jComboBoxSelect.getSelectedItem().toString();\r
}\r
- listItem.addElement(jTextField.getText() + this.Separator + strLibClass);\r
+ listItem.addElement(jTextField.getText().replace('\\', '/') + this.Separator + strLibClass);\r
}\r
//\r
// remove selected line\r
// Select files from current workspace\r
//\r
JFileChooser chooser = new JFileChooser(System.getenv("WORKSPACE"));\r
+ File theFile = null;\r
+ String headerDest = null;\r
\r
chooser.setMultiSelectionEnabled(false);\r
chooser.setFileSelectionMode(JFileChooser.FILES_AND_DIRECTORIES);\r
int retval = chooser.showOpenDialog(frame);\r
if (retval == JFileChooser.APPROVE_OPTION) {\r
\r
- File theFile = chooser.getSelectedFile();\r
+ theFile = chooser.getSelectedFile();\r
String file = theFile.getPath();\r
if (!file.startsWith(System.getenv("WORKSPACE"))) {\r
JOptionPane.showMessageDialog(frame, "You can only select files in current workspace!");\r
return;\r
}\r
+ \r
+ \r
+ }\r
+ else {\r
+ return;\r
+ }\r
+ \r
+ if (!theFile.getPath().startsWith(PackagingMain.dirForNewSpd)) {\r
//\r
- // record relative path of selected file. Assume top level package directory lies directly in workspace\r
+ //ToDo: copy elsewhere header file to new pkg dir, prompt user to chooser a location\r
//\r
- int fileIndex = file.indexOf(System.getProperty("file.separator"), System.getenv("WORKSPACE").length() + 1);\r
- jTextField.setText(file.substring(fileIndex + 1));\r
- \r
+ JOptionPane.showMessageDialog(frame, "You must copy header file into current package directory!");\r
+ return;\r
}\r
+ \r
+ headerDest = theFile.getPath();\r
+ int fileIndex = headerDest.indexOf(System.getProperty("file.separator"), PackagingMain.dirForNewSpd.length());\r
+ \r
+ jTextField.setText(headerDest.substring(fileIndex + 1).replace('\\', '/'));\r
+ \r
}\r
});\r
}\r
import javax.swing.JScrollPane;\r
import javax.swing.JButton;\r
import javax.swing.JFrame;\r
+import javax.swing.filechooser.FileFilter;\r
\r
/**\r
GUI for create MsaFile elements of spd file\r
@return javax.swing.JButton \r
**/\r
private JButton getJButton() {\r
+ final FileFilter filter = new PkgFileFilter("msa");\r
+ \r
if (jButton == null) {\r
jButton = new JButton();\r
jButton.setBounds(new java.awt.Rectangle(377,46,89,20));\r
jButton.addMouseListener(new java.awt.event.MouseAdapter() {\r
public void mouseClicked(java.awt.event.MouseEvent e) {\r
JFileChooser chooser = new JFileChooser(System.getenv("WORKSPACE"));\r
+ File theFile = null;\r
+ String msaDest = null;\r
\r
chooser.setMultiSelectionEnabled(false);\r
chooser.setFileSelectionMode(JFileChooser.FILES_AND_DIRECTORIES);\r
- chooser.setFileFilter(new PkgFileFilter("msa"));\r
+ chooser.setFileFilter(filter);\r
int retval = chooser.showOpenDialog(frame);\r
if (retval == JFileChooser.APPROVE_OPTION) {\r
\r
- File theFile = chooser.getSelectedFile();\r
+ theFile = chooser.getSelectedFile();\r
String file = theFile.getPath();\r
if (!file.startsWith(System.getenv("WORKSPACE"))) {\r
JOptionPane.showMessageDialog(frame, "You can only select files in current workspace!");\r
return;\r
}\r
- int fileIndex = file.indexOf(System.getProperty("file.separator"), System.getenv("WORKSPACE").length() + 1);\r
- jTextField.setText(file.substring(fileIndex + 1));\r
\r
}\r
+ else {\r
+ return;\r
+ }\r
+ \r
+ if (!theFile.getPath().startsWith(PackagingMain.dirForNewSpd)) {\r
+ //\r
+ //ToDo: copy elsewhere msa to new pkg dir, prompt user to chooser a location\r
+ //\r
+ JOptionPane.showMessageDialog(frame, "You must copy msa file into current package directory!");\r
+ return;\r
+ }\r
+ \r
+ msaDest = theFile.getPath();\r
+ int fileIndex = msaDest.indexOf(System.getProperty("file.separator"), PackagingMain.dirForNewSpd.length());\r
+ \r
+ jTextField.setText(msaDest.substring(fileIndex + 1).replace('\\', '/'));\r
}\r
});\r
}\r
strLibClass = jComboBoxSelect.getSelectedItem().toString();\r
}\r
\r
- listItem.addElement(jTextField.getText() + Separator + strLibClass);\r
+ listItem.addElement(jTextField.getText().replace('\\', '/') + Separator + strLibClass);\r
}\r
\r
if (arg0.getSource() == jButtonRemove) {\r
\r
static JFrame frame;\r
\r
+ static String dirForNewSpd = null;\r
+\r
private JPanel jContentPane = null;\r
\r
private JButton jButton = null;\r
jButton5.setText("Create Package Description File");\r
jButton5.addMouseListener(new java.awt.event.MouseAdapter() {\r
public void mouseClicked(java.awt.event.MouseEvent e) {\r
+ JFileChooser chooser = new JFileChooser(System.getenv("WORKSPACE"));\r
+ chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);\r
+ chooser.setMultiSelectionEnabled(false);\r
+ chooser.setDialogTitle("Please specify where to save the new spd file");\r
+\r
+ int retval = chooser.showSaveDialog(frame);\r
+ if (retval == JFileChooser.APPROVE_OPTION) {\r
+ try {\r
+ File theFile = chooser.getSelectedFile();\r
+ PackagingMain.dirForNewSpd = theFile.getPath();\r
+\r
+ } catch (Exception ee) {\r
+ System.out.println(ee.toString());\r
+ }\r
+// pThis.dispose();\r
+ }\r
+ else {\r
+ return;\r
+ }\r
SpdFileContents sfc = new SpdFileContents();\r
ModalFrameUtil.showAsModal(new PackageAction(sfc), pThis);\r
}\r