Merge pull request #93 from lenhard/logic-improvements

Logic improvements (Java 1.7+)

Author: simonharrer

CHANGELOG

@@ -1,4 +1,5 @@
 [master]
+    - Perform syntax improvements enabled by Java 1.7+ (diamond operator, try-with-resources)
     - List of authors is now auto generated `scripts/generate-authors.sh` and inserted into L10N About.html
     - Remove Mr.DLib support as MR.DLib will be shut down in 2015
     - Streamline logging API: Replace usages of java.util.logging with commons.logging

src/main/java/net/sf/jabref/CustomEntryType.java

@@ -42,7 +42,7 @@ public class CustomEntryType extends BibtexEntryType {
 
 
     public CustomEntryType(String name_, String[] req_, String[] priOpt_, String[] secOpt_) {
-        name = StringUtil.nCase(name_);
+        name = StringUtil.capitalizeFirst(name_);
         parseRequiredFields(req_);
         priOpt = priOpt_;
         opt = Util.arrayConcat(priOpt_, secOpt_);
@@ -53,7 +53,7 @@ public CustomEntryType(String name_, String[] req_, String[] opt_) {
     }
 
     private CustomEntryType(String name_, String reqStr, String optStr) {
-        name = StringUtil.nCase(name_);
+        name = StringUtil.capitalizeFirst(name_);
         if (reqStr.isEmpty()) {
             req = new String[0];
         } else {

src/main/java/net/sf/jabref/EntryTypeDialog.java

@@ -103,7 +103,7 @@ public void windowClosing(WindowEvent e) {
 
         for (BibtexEntryType tp : BibtexEntryType.getAllValues()) {
             if (tp.isVisibleAtNewEntryDialog()) {
-                TypeButton b = new TypeButton(StringUtil.nCase(tp.getName()), tp);
+                TypeButton b = new TypeButton(StringUtil.capitalizeFirst(tp.getName()), tp);
                 b.addActionListener(this);
                 // Check if we should finish the row.
                 col++;

src/main/java/net/sf/jabref/JabRefFrame.java

@@ -35,7 +35,6 @@
 import java.awt.event.WindowEvent;
 import java.io.File;
 import java.io.IOException;
-import java.lang.reflect.Method;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -1233,13 +1232,13 @@ public NewEntryAction(KeyStroke key) {
 
         public NewEntryAction(String type_) {
             // This action leads to the creation of a specific entry.
-            putValue(Action.NAME, StringUtil.nCase(type_));
+            putValue(Action.NAME, StringUtil.capitalizeFirst(type_));
             type = type_;
         }
 
         public NewEntryAction(String type_, KeyStroke key) {
             // This action leads to the creation of a specific entry.
-            putValue(Action.NAME, StringUtil.nCase(type_));
+            putValue(Action.NAME, StringUtil.capitalizeFirst(type_));
             putValue(Action.ACCELERATOR_KEY, key);
             type = type_;
         }
@@ -2558,7 +2557,7 @@ class EditAction extends MnemonicAwareAction {
         public EditAction(String command, URL icon) {
             super(new ImageIcon(icon));
             this.command = command;
-            String nName = StringUtil.nCase(command);
+            String nName = StringUtil.capitalizeFirst(command);
             putValue(Action.NAME, nName);
             putValue(Action.ACCELERATOR_KEY, prefs.getKey(nName));
             putValue(Action.SHORT_DESCRIPTION, Globals.lang(nName));

src/main/java/net/sf/jabref/JabRefPreferences.java

@@ -1383,10 +1383,10 @@ public CustomEntryType getCustomEntryType(int number) {
             return null;
         }
         if (priOpt == null) {
-            return new CustomEntryType(StringUtil.nCase(name), req, opt);
+            return new CustomEntryType(StringUtil.capitalizeFirst(name), req, opt);
         }
         String[] secOpt = Util.getRemainder(opt, priOpt);
-        return new CustomEntryType(StringUtil.nCase(name), req, priOpt, secOpt);
+        return new CustomEntryType(StringUtil.capitalizeFirst(name), req, priOpt, secOpt);
 
     }
 

src/main/java/net/sf/jabref/gui/AttachFileDialog.java

@@ -140,8 +140,8 @@ public void actionPerformed(ActionEvent event) {
 
         FormLayout layout = new FormLayout("fill:160dlu, 4dlu, fill:pref", "");
         DefaultFormBuilder builder = new DefaultFormBuilder(layout);
-        //builder.append(Util.nCase(fieldName));//(editor.getLabel());
-        builder.appendSeparator(StringUtil.nCase(fieldName));
+        //builder.append(Util.capitalizeFirst(fieldName));//(editor.getLabel());
+        builder.appendSeparator(StringUtil.capitalizeFirst(fieldName));
         builder.append(editor.getTextComponent());
         builder.append(browse);
 

src/main/java/net/sf/jabref/gui/EntryCustomizationDialog2.java

@@ -268,7 +268,7 @@ private void applyChanges() {
             if (defaulted.contains(stringListEntry.getKey())) {
                 // This type should be reverted to its default setup.
                 //System.out.println("Defaulting: "+typeName);
-                String nm = StringUtil.nCase(stringListEntry.getKey());
+                String nm = StringUtil.capitalizeFirst(stringListEntry.getKey());
                 BibtexEntryType.removeType(nm);
 
                 updateTypesForEntries(nm);
@@ -294,8 +294,8 @@ private void applyChanges() {
             if (changesMade) {
                 //System.out.println("Updating: "+typeName);
                 CustomEntryType typ = biblatexMode ?
-                        new CustomEntryType(StringUtil.nCase(stringListEntry.getKey()), reqStr, optStr, opt2Str) :
-                        new CustomEntryType(StringUtil.nCase(stringListEntry.getKey()), reqStr, optStr);
+                        new CustomEntryType(StringUtil.capitalizeFirst(stringListEntry.getKey()), reqStr, optStr, opt2Str) :
+                        new CustomEntryType(StringUtil.capitalizeFirst(stringListEntry.getKey()), reqStr, optStr);
 
                 BibtexEntryType.addOrModifyCustomEntryType(typ);
                 updateTypesForEntries(typ.getName());
@@ -329,14 +329,14 @@ private void typeDeletion(String name) {
                                 + "type will be declared "
                                 + "typeless. Continue?"),
                                 Globals.lang("Delete custom format") +
-                                        " '" + StringUtil.nCase(name) + '\'', JOptionPane.YES_NO_OPTION,
+                                        " '" + StringUtil.capitalizeFirst(name) + '\'', JOptionPane.YES_NO_OPTION,
                                 JOptionPane.WARNING_MESSAGE);
                 if (reply != JOptionPane.YES_OPTION) {
                     return;
                 }
             }
             BibtexEntryType.removeType(name);
-            updateTypesForEntries(StringUtil.nCase(name));
+            updateTypesForEntries(StringUtil.capitalizeFirst(name));
             changed.remove(name);
             reqLists.remove(name);
             optLists.remove(name);

src/main/java/net/sf/jabref/gui/ImportInspectionDialog.java

@@ -1522,7 +1522,7 @@ public String getColumnName(int i) {
                 return Globals.lang("Keep");
             }
             if (i >= PAD) {
-                return StringUtil.nCase(fields[i - PAD]);
+                return StringUtil.capitalizeFirst(fields[i - PAD]);
             }
             return "";
         }

src/main/java/net/sf/jabref/gui/MainTableFormat.java

@@ -118,7 +118,7 @@ public String getColumnName(int col) {
                 if (disName != null) {
                     sb.append(disName);
                 } else {
-                    sb.append(StringUtil.nCase(fld[i]));
+                    sb.append(StringUtil.capitalizeFirst(fld[i]));
                 }
             }
             return sb.toString();
@@ -128,7 +128,7 @@ public String getColumnName(int col) {
               return disName ;
             } */
         }
-        //return Util.nCase(columns[col - padleft]);
+        //return Util.capitalizeFirst(columns[col - padleft]);
     }
 
     /**

src/main/java/net/sf/jabref/gui/SearchResultsDialog.java

@@ -464,7 +464,7 @@ public int getColumnCount() {
         @Override
         public String getColumnName(int column) {
             if (column >= PAD) {
-                return StringUtil.nCase(fields[column - PAD]);
+                return StringUtil.capitalizeFirst(fields[column - PAD]);
             } else {
                 return "";
             }