Revision: 1149
http://cishell.svn.sourceforge.net/cishell/?rev=1149&view=rev
Author: pataphil
Date: 2010-11-02 17:48:25 +0000 (Tue, 02 Nov 2010)
Log Message:
-----------
* Fixed default File/Directory GUI widget prefixes.
Modified Paths:
--------------
trunk/clients/gui/org.cishell.reference.gui.guibuilder.swt/src/org/cishell/reference/gui/guibuilder/swt/builder/components/FileComponent.java
trunk/clients/gui/org.cishell.reference.gui.guibuilder.swt/src/org/cishell/reference/gui/guibuilder/swt/builder/components/StringComponent.java
Modified: trunk/clients/gui/org.cishell.reference.gui.guibuilder.swt/src/org/cishell/reference/gui/guibuilder/swt/builder/components/FileComponent.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.guibuilder.swt/src/org/cishell/reference/gui/guibuilder/swt/builder/components/FileComponent.java 2010-10-29 02:47:34 UTC (rev 1148)
+++ trunk/clients/gui/org.cishell.reference.gui.guibuilder.swt/src/org/cishell/reference/gui/guibuilder/swt/builder/components/FileComponent.java 2010-11-02 17:48:25 UTC (rev 1149)
@@ -16,8 +16,6 @@
import java.io.File;
import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.layout.GridData;
Modified: trunk/clients/gui/org.cishell.reference.gui.guibuilder.swt/src/org/cishell/reference/gui/guibuilder/swt/builder/components/StringComponent.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.guibuilder.swt/src/org/cishell/reference/gui/guibuilder/swt/builder/components/StringComponent.java 2010-10-29 02:47:34 UTC (rev 1148)
+++ trunk/clients/gui/org.cishell.reference.gui.guibuilder.swt/src/org/cishell/reference/gui/guibuilder/swt/builder/components/StringComponent.java 2010-11-02 17:48:25 UTC (rev 1149)
@@ -129,16 +129,18 @@
}
public void setValue(Object value) {
- if(value.toString().startsWith("textarea:")) {
- value = value.toString().substring("textarea:".length());
- }
+ String valueString = emptyStringIfNull(value);
+ valueString = fixTextFieldPrefix("textarea:", valueString);
+ valueString = fixTextFieldPrefix("file:", valueString);
+ valueString = fixTextFieldPrefix("directory:", valueString);
+
if (textField != null) {
- textField.setText(value == null ? "" : value.toString());
+ textField.setText(valueString);
} else if (combo != null) {
+ int setComboToIndex = -1;
- int setComboToIndex = -1;
for (int i = 0; i < optionValues.length; i++) {
- if (value.equals(optionValues[i])) {
+ if (valueString.equals(optionValues[i])) {
setComboToIndex = i;
}
}
@@ -146,9 +148,31 @@
if (setComboToIndex != -1) {
combo.select(setComboToIndex);
} else {
- System.err.println("Attempted to set combo box to a value " +
- "that didn't exist inside the combo box.");
+ /* TODO: Log this (or do something with it besides printint it to a place most
+ * users won't see it)?
+ */
+ String warningMessage =
+ "Attempted to set combo box to a value that didn't exist inside the " +
+ "combo box.";
+ System.err.println(warningMessage);
}
}
}
+
+ // TODO: Use the CIShell Utilities version, but only when that's been all refactor and stuff.
+ private String emptyStringIfNull(Object value) {
+ if (value == null) {
+ return "";
+ } else {
+ return value.toString();
+ }
+ }
+
+ private String fixTextFieldPrefix(String prefix, String value) {
+ if (value.startsWith(prefix)) {
+ return value.substring(prefix.length());
+ } else {
+ return value;
+ }
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
