You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by tw...@apache.org on 2008/05/27 15:31:04 UTC
svn commit: r660506 - in
/incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cvd:
CVD.java MainFrame.java
Author: twgoetz
Date: Tue May 27 06:31:02 2008
New Revision: 660506
URL: http://svn.apache.org/viewvc?rev=660506&view=rev
Log:
Jira UIMA-1046: added -ini command line parameter to CVD.
https://issues.apache.org/jira/browse/UIMA-1046
Modified:
incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/CVD.java
incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/MainFrame.java
Modified: incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/CVD.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/CVD.java?rev=660506&r1=660505&r2=660506&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/CVD.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/CVD.java Tue May 27 06:31:02 2008
@@ -47,6 +47,8 @@
private static final String DATA_PATH_PARAM = "-datapath";
+ private static final String INI_FILE_PARAM = "-ini";
+
private static final String LOOK_AND_FEEL_PARAM = "-lookandfeel";
private CVD() {
@@ -54,20 +56,24 @@
}
public static MainFrame createMainFrame() {
- final MainFrame frame = new MainFrame();
+ return createMainFrame(null);
+ }
+
+ public static MainFrame createMainFrame(File iniFile) {
+ final MainFrame frame = new MainFrame(iniFile);
// Set icon.
ImageIcon icon = Images.getImageIcon(Images.MICROSCOPE);
if (icon != null) {
frame.setIconImage(icon.getImage());
}
try {
- javax.swing.SwingUtilities.invokeAndWait(new Runnable() {
+ javax.swing.SwingUtilities.invokeAndWait(new Runnable() {
- public void run() {
- frame.pack();
- frame.setVisible(true);
- }
- });
+ public void run() {
+ frame.pack();
+ frame.setVisible(true);
+ }
+ });
} catch (InterruptedException e) {
e.printStackTrace();
} catch (InvocationTargetException e) {
@@ -84,6 +90,7 @@
parser.addParameter(DATA_PATH_PARAM, true);
parser.addParameter(LOOK_AND_FEEL_PARAM, true);
parser.addParameter(EXECUTE_SWITCH);
+ parser.addParameter(INI_FILE_PARAM, true);
return parser;
}
@@ -129,7 +136,12 @@
System.err.println(e.getMessage());
}
}
- MainFrame frame = createMainFrame();
+ File iniFile = null;
+ if (clp.isInArgsList(INI_FILE_PARAM)) {
+ String iniFileName = clp.getParamArgument(INI_FILE_PARAM);
+ iniFile = new File(iniFileName);
+ }
+ MainFrame frame = createMainFrame(iniFile);
if (clp.isInArgsList(TEXT_FILE_PARAM)) {
frame.loadTextFile(new File(clp.getParamArgument(TEXT_FILE_PARAM)));
}
Modified: incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/MainFrame.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/MainFrame.java?rev=660506&r1=660505&r2=660506&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/MainFrame.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/MainFrame.java Tue May 27 06:31:02 2008
@@ -300,6 +300,9 @@
private JMenu recentDescFileMenu;
+ // Ini file
+ private File iniFile = null;
+
// Code page support
private String codePagePrefsList = null;
@@ -449,40 +452,9 @@
*
* @throws HeadlessException
*/
- public MainFrame() {
+ public MainFrame(File iniFile) {
super();
- init();
- }
-
- /**
- * Constructor for MainFrame.
- *
- * @param arg0
- */
- public MainFrame(GraphicsConfiguration arg0) {
- super(arg0);
- init();
- }
-
- /**
- * Constructor for MainFrame.
- *
- * @param arg0
- * @throws HeadlessException
- */
- public MainFrame(String arg0) {
- super(arg0);
- init();
- }
-
- /**
- * Constructor for MainFrame.
- *
- * @param arg0
- * @param arg1
- */
- public MainFrame(String arg0, GraphicsConfiguration arg1) {
- super(arg0, arg1);
+ this.iniFile = iniFile;
init();
}
@@ -1341,7 +1313,7 @@
File homeDir = new File(System.getProperty("user.home"));
this.logFile = new File(homeDir, "uima.log");
- // delete file if exist
+ // delete file if it exists
this.logFile.delete();
// initialize log framework
@@ -1688,10 +1660,12 @@
}
private void loadProgramPreferences() throws IOException {
- File home = new File(System.getProperty("user.home"));
- File prefFile = new File(home, "annotViewer.pref");
- if (prefFile.exists() && prefFile.isFile() && prefFile.canRead()) {
- FileInputStream in = new FileInputStream(prefFile);
+ if (this.iniFile == null) {
+ File home = new File(System.getProperty("user.home"));
+ this.iniFile = new File(home, "annotViewer.pref");
+ }
+ if (this.iniFile.exists() && this.iniFile.isFile() && this.iniFile.canRead()) {
+ FileInputStream in = new FileInputStream(this.iniFile);
this.preferences = new Properties();
this.preferences.load(in);
String fileOpenDirName = this.preferences.getProperty(textDirPref);
@@ -1803,8 +1777,6 @@
public void saveProgramPreferences() throws IOException {
// File open dialog preferences.
- File home = new File(System.getProperty("user.home"));
- File prefFile = new File(home, "annotViewer.pref");
if (this.preferences == null) {
this.preferences = new Properties();
}
@@ -1865,7 +1837,7 @@
this.preferences.setProperty(descFileListPref, stringListToString(this.recentDescFiles
.toStringList()));
// Write out preferences to file.
- FileOutputStream out = new FileOutputStream(prefFile);
+ FileOutputStream out = new FileOutputStream(this.iniFile);
this.preferences.store(out, "Automatically generated preferences file for Annotation Viewer");
}