halfdan/eva2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

refs #8

Browse Source 
Cleaned up the code and documented some StringTools methods.
StringTools now has a method to turn a camelCase String into a more readable version: "camelCase" => "Camel Case"
PropertySheetPanel used this function to display label texts.
This commit is contained in:
Fabian Becker 2012-04-18 14:48:32 +00:00
parent c62db5f36f
commit 0ba2d9706c
3 changed files with 121 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/eva2/client/EvAClient.java
View File

@ -1195,7 +1195,7 @@ public class EvAClient implements RemoteStateListener, Serializable {
final class SplashScreen extends Frame { final class SplashScreen extends Frame {
private static final long serialVersionUID = 1281793825850423095L; private static final long serialVersionUID = 1281793825850423095L;
String imgLocation; private String imgLocation;
public SplashScreen(String imgLoc) { public SplashScreen(String imgLoc) {
imgLocation = imgLoc; imgLocation = imgLoc;

3
src/eva2/gui/PropertySheetPanel.java
View File

@ -268,7 +268,7 @@ public class PropertySheetPanel extends JPanel implements PropertyChangeListener
// Add some specific display for some greeks here // Add some specific display for some greeks here
name = translateGreek(name); name = translateGreek(name);
name = eva2.tools.StringTools.humaniseCamelCase(name);
addLabelView(componentOffset, gbLayout, i, name, newView); addLabelView(componentOffset, gbLayout, i, name, newView);
m_NumEditable++; m_NumEditable++;
if (m_Properties[i].isHidden()) { if (m_Properties[i].isHidden()) {
@ -397,6 +397,7 @@ public class PropertySheetPanel extends JPanel implements PropertyChangeListener
private void addLabelView(int componentOffset, GridBagLayout gbLayout, private void addLabelView(int componentOffset, GridBagLayout gbLayout,
int i, String name, JComponent newView) { int i, String name, JComponent newView) {
m_Labels[i] = makeLabel(name); m_Labels[i] = makeLabel(name);
m_Views[i] = newView; m_Views[i] = newView;
m_ViewWrapper[i] = new JPanel(); m_ViewWrapper[i] = new JPanel();

165
src/eva2/tools/StringTools.java
View File

@ -1,14 +1,22 @@
package eva2.tools; package eva2.tools;
import java.util.Arrays;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.StringTokenizer;
import eva2.gui.BeanInspector; import eva2.gui.BeanInspector;
import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
public class StringTools { /**
* Utility class to provide simplification functions
* for working with Strings.
*
* @author Fabian Becker, Marcel Kronfeld
*/
public final class StringTools {
/**
* Private constructor to prevent instantiation.
*/
private StringTools() { }
/** /**
* Returns a HTML formated String, in which each line is at most lineBreak * Returns a HTML formated String, in which each line is at most lineBreak
@ -19,23 +27,27 @@ public class StringTools {
* @return * @return
*/ */
public static String toHTML(String string, int lineBreak) { public static String toHTML(String string, int lineBreak) {
StringTokenizer st = new StringTokenizer(string, " "); StringTokenizer sTok = new StringTokenizer(string, " ");
if (!st.hasMoreTokens()) return "<html><body></body></html>"; if (!sTok.hasMoreTokens()) {
StringBuffer sbuf = new StringBuffer(st.nextToken()); return "<html><body></body></html>";
int length = sbuf.length();
while (st.hasMoreElements()) {
if (length >= lineBreak) {
sbuf.append("<br>");
length = 0;
} else sbuf.append(" ");
String tmp = st.nextToken();
length += tmp.length() + 1;
sbuf.append(tmp);
} }
sbuf.insert(0, "<html><body>"); StringBuilder sBuf = new StringBuilder(sTok.nextToken());
sbuf.append("</body></html>");
return sbuf.toString(); int length = sBuf.length();
while (sTok.hasMoreElements()) {
if (length >= lineBreak) {
sBuf.append("<br>");
length = 0;
} else {
sBuf.append(" ");
}
String tmp = sTok.nextToken();
length += tmp.length() + 1;
sBuf.append(tmp);
}
sBuf.insert(0, "<html><body>");
sBuf.append("</body></html>");
return sBuf.toString();
} }
public static boolean arrayContains(String[] arr, String key, boolean ignoreCase) { public static boolean arrayContains(String[] arr, String key, boolean ignoreCase) {
@ -251,20 +263,22 @@ public class StringTools {
/** /**
* Concatenate a list of Strings using a given delimiter string. * Concatenate a list of Strings using a given delimiter string.
* *
* @param headlineFields * @param strings List of Strings to concatenate
* @param delim * @param delim Delimiter for concatenation
* @return * @return String representation
*/ */
public static String concatFields(List<String> strings, public static String concatFields(final List<String> strings,
String delim) { final String delim) {
StringBuffer sb = new StringBuffer(); StringBuilder sBuilder = new StringBuilder();
int cnt=0; int cnt = 0;
for (String field : strings) { for (String field : strings) {
if (cnt>0) sb.append(delim); if (cnt > 0) {
sb.append(field); sBuilder.append(delim);
}
sBuilder.append(field);
cnt++; cnt++;
} }
return sb.toString(); return sBuilder.toString();
} }
/** /**
@ -276,11 +290,13 @@ public class StringTools {
* @return * @return
*/ */
public static String concatValues(List<Object> objects, public static String concatValues(List<Object> objects,
String delim) { final String delim) {
StringBuffer sb = new StringBuffer(); StringBuilder sb = new StringBuilder();
int cnt=0; int cnt = 0;
for (Object v : objects) { for (Object v : objects) {
if (cnt>0) sb.append(delim); if (cnt > 0) {
sb.append(delim);
}
sb.append(BeanInspector.toString(v)); sb.append(BeanInspector.toString(v));
cnt++; cnt++;
} }
@ -289,10 +305,12 @@ public class StringTools {
public static String concatFields(String[] strs, public static String concatFields(String[] strs,
String delim) { String delim) {
StringBuffer sb = new StringBuffer(); StringBuilder sb = new StringBuilder();
int cnt=0; int cnt = 0;
for (String str : strs) { for (String str : strs) {
if (cnt>0) sb.append(delim); if (cnt > 0) {
sb.append(delim);
}
sb.append(str); sb.append(str);
cnt++; cnt++;
} }
@ -329,16 +347,18 @@ public class StringTools {
/** /**
* Delete a certain character from a string. * Delete a certain character from a string.
* *
* @param c * @param c Character to delete
* @param str * @param str String to remove c from.
* @return * @return String with character c removed.
*/ */
public static String deleteChar(char c, String str) { public static String deleteChar(final char c, final String str) {
StringBuffer sb = new StringBuffer(); StringBuilder sBuilder = new StringBuilder();
for (int i=0; i<str.length(); i++) { for (int i = 0; i < str.length(); i++) {
if (c!=str.charAt(i)) sb.append(str.charAt(i)); if (c != str.charAt(i)) {
sBuilder.append(str.charAt(i));
}
} }
return sb.toString(); return sBuilder.toString();
} }
/** /**
@ -353,5 +373,54 @@ public class StringTools {
int p = str.lastIndexOf(c); int p = str.lastIndexOf(c);
return str.substring(p+1); // for -1 this just works as well return str.substring(p+1); // for -1 this just works as well
} }
/**
* Converts a camelCase to a more human form, with spaces.
* E.g. 'Camel Case'.
*
* @param word Word to convert to a readable String
* @return Readable String representation of input word
*/
public static String humaniseCamelCase(final String word) {
Pattern pattern = Pattern.compile("([A-Z]|[a-z])[a-z]*");
List<String> tokens = new ArrayList<String>();
Matcher matcher = pattern.matcher(word);
String acronym = "";
while (matcher.find()) {
String found = matcher.group();
if (found.matches("^[A-Z]$")) {
acronym += found;
} else {
if (acronym.length() > 0) {
//we have an acronym to add before we continue
tokens.add(acronym);
acronym = "";
}
tokens.add(upcaseFirst(found));
}
}
if (acronym.length() > 0) {
tokens.add(acronym);
}
if (!tokens.isEmpty()) {
return concatFields(tokens, " ");
}
return upcaseFirst(word);
}
/**
* Takes a string and returns it with the first character
* converted to uppercase.
*
* @param word Word to modify
* @return Parameter with its first character converted to uppercase
*/
public static String upcaseFirst(final String word) {
return word.substring(0, 1).toUpperCase() + word.substring(1);
}
} }