1) Fixed issue #844: Short form of ternary operator (since PHP 5.3).

[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpdt / core / NamingConventions.java

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/NamingConventions.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/NamingConventions.java
index a0c8d3e..feead3c 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/NamingConventions.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/NamingConventions.java
@@ -353,11 +353,11 @@ public final class NamingConventions {
         * @see JavaCore#setOptions(java.util.Hashtable)
         * @see JavaCore#getDefaultOptions()
         */
-       public static String removePrefixAndSuffixForArgumentName(
-                       IJavaProject javaProject, String argumentName) {
-               return String.valueOf(removePrefixAndSuffixForArgumentName(javaProject,
-                               argumentName.toCharArray()));
-       }
+//     public static String removePrefixAndSuffixForArgumentName(
+//                     IJavaProject javaProject, String argumentName) {
+//             return String.valueOf(removePrefixAndSuffixForArgumentName(javaProject,
+//                             argumentName.toCharArray()));
+//     }
 
        /**
         * Remove prefix and suffix from a field name.
@@ -435,11 +435,11 @@ public final class NamingConventions {
         * @see JavaCore#setOptions(java.util.Hashtable)
         * @see JavaCore#getDefaultOptions()
         */
-       public static String removePrefixAndSuffixForFieldName(
-                       IJavaProject javaProject, String fieldName, int modifiers) {
-               return String.valueOf(removePrefixAndSuffixForFieldName(javaProject,
-                               fieldName.toCharArray(), modifiers));
-       }
+//     public static String removePrefixAndSuffixForFieldName(
+//                     IJavaProject javaProject, String fieldName, int modifiers) {
+//             return String.valueOf(removePrefixAndSuffixForFieldName(javaProject,
+//                             fieldName.toCharArray(), modifiers));
+//     }
 
        /**
         * Remove prefix and suffix from a local variable name.
@@ -505,11 +505,11 @@ public final class NamingConventions {
         * @see JavaCore#setOptions(java.util.Hashtable)
         * @see JavaCore#getDefaultOptions()
         */
-       public static String removePrefixAndSuffixForLocalVariableName(
-                       IJavaProject javaProject, String localName) {
-               return String.valueOf(removePrefixAndSuffixForLocalVariableName(
-                               javaProject, localName.toCharArray()));
-       }
+//     public static String removePrefixAndSuffixForLocalVariableName(
+//                     IJavaProject javaProject, String localName) {
+//             return String.valueOf(removePrefixAndSuffixForLocalVariableName(
+//                             javaProject, localName.toCharArray()));
+//     }
 
        /**
         * Suggest names for an argument. The name is computed from argument's type
@@ -595,13 +595,13 @@ public final class NamingConventions {
         * @see JavaCore#setOptions(java.util.Hashtable)
         * @see JavaCore#getDefaultOptions()
         */
-       public static String[] suggestArgumentNames(IJavaProject javaProject,
-                       String packageName, String qualifiedTypeName, int dim,
-                       String[] excludedNames) {
-               return convertCharsToString(suggestArgumentNames(javaProject,
-                               packageName.toCharArray(), qualifiedTypeName.toCharArray(),
-                               dim, convertStringToChars(excludedNames)));
-       }
+//     public static String[] suggestArgumentNames(IJavaProject javaProject,
+//                     String packageName, String qualifiedTypeName, int dim,
+//                     String[] excludedNames) {
+//             return convertCharsToString(suggestArgumentNames(javaProject,
+//                             packageName.toCharArray(), qualifiedTypeName.toCharArray(),
+//                             dim, convertStringToChars(excludedNames)));
+//     }
 
        /**
         * Suggest names for a field. The name is computed from field's type and
@@ -695,13 +695,13 @@ public final class NamingConventions {
         * @see JavaCore#setOptions(java.util.Hashtable)
         * @see JavaCore#getDefaultOptions()
         */
-       public static String[] suggestFieldNames(IJavaProject javaProject,
-                       String packageName, String qualifiedTypeName, int dim,
-                       int modifiers, String[] excludedNames) {
-               return convertCharsToString(suggestFieldNames(javaProject, packageName
-                               .toCharArray(), qualifiedTypeName.toCharArray(), dim,
-                               modifiers, convertStringToChars(excludedNames)));
-       }
+//     public static String[] suggestFieldNames(IJavaProject javaProject,
+//                     String packageName, String qualifiedTypeName, int dim,
+//                     int modifiers, String[] excludedNames) {
+//             return convertCharsToString(suggestFieldNames(javaProject, packageName
+//                             .toCharArray(), qualifiedTypeName.toCharArray(), dim,
+//                             modifiers, convertStringToChars(excludedNames)));
+//     }
 
        /**
         * Suggest names for a local variable. The name is computed from variable's
@@ -787,13 +787,13 @@ public final class NamingConventions {
         * @see JavaCore#setOptions(java.util.Hashtable)
         * @see JavaCore#getDefaultOptions()
         */
-       public static String[] suggestLocalVariableNames(IJavaProject javaProject,
-                       String packageName, String qualifiedTypeName, int dim,
-                       String[] excludedNames) {
-               return convertCharsToString(suggestLocalVariableNames(javaProject,
-                               packageName.toCharArray(), qualifiedTypeName.toCharArray(),
-                               dim, convertStringToChars(excludedNames)));
-       }
+//     public static String[] suggestLocalVariableNames(IJavaProject javaProject,
+//                     String packageName, String qualifiedTypeName, int dim,
+//                     String[] excludedNames) {
+//             return convertCharsToString(suggestLocalVariableNames(javaProject,
+//                             packageName.toCharArray(), qualifiedTypeName.toCharArray(),
+//                             dim, convertStringToChars(excludedNames)));
+//     }
 
        /**
         * Suggest name for a getter method. The name is computed from field's name
@@ -1047,14 +1047,14 @@ public final class NamingConventions {
                return newName;
        }
 
-       private static String[] convertCharsToString(char[][] c) {
-               int length = c == null ? 0 : c.length;
-               String[] s = new String[length];
-               for (int i = 0; i < length; i++) {
-                       s[i] = String.valueOf(c[i]);
-               }
-               return s;
-       }
+//     private static String[] convertCharsToString(char[][] c) {
+//             int length = c == null ? 0 : c.length;
+//             String[] s = new String[length];
+//             for (int i = 0; i < length; i++) {
+//                     s[i] = String.valueOf(c[i]);
+//             }
+//             return s;
+//     }
 
        private static char[][] convertStringToChars(String[] s) {
                int length = s == null ? 0 : s.length;