Cassandra value handlers.

Formatters model refactoring

Former-commit-id: aa5aaf75

plugins/org.jkiss.dbeaver.core/META-INF/MANIFEST.MF

@@ -28,6 +28,8 @@ Export-Package: org.apache.commons.logging,
  org.jkiss.dbeaver.model.exec.plan,
  org.jkiss.dbeaver.model.impl,
  org.jkiss.dbeaver.model.impl.data,
+ org.jkiss.dbeaver.model.impl.data.editors,
+ org.jkiss.dbeaver.model.impl.data.formatters,
  org.jkiss.dbeaver.model.impl.edit,
  org.jkiss.dbeaver.model.impl.jdbc,
  org.jkiss.dbeaver.model.impl.jdbc.cache,

plugins/org.jkiss.dbeaver.core/plugin.xml

@@ -2152,22 +2152,22 @@
     </extension>
 
     <extension point="org.jkiss.dbeaver.dataFormatter">
-        <formatter id="date" label="%DateFormatter.date.label" class="org.jkiss.dbeaver.model.impl.data.DateTimeDataFormatter" sampleClass="org.jkiss.dbeaver.model.impl.data.DateFormatSample">
+        <formatter id="date" label="%DateFormatter.date.label" class="org.jkiss.dbeaver.model.impl.data.formatters.DateTimeDataFormatter" sampleClass="org.jkiss.dbeaver.model.impl.data.formatters.DateFormatSample">
             <propertyGroup label="%DateFormatter.date.general.label">
                 <property id="pattern" label="%DateFormatter.date.general.pattern.label" type="string" description="%DateFormatter.date.general.pattern.description" required="true"/>
             </propertyGroup>
         </formatter>
-        <formatter id="time" label="%DateFormatter.time.label" class="org.jkiss.dbeaver.model.impl.data.DateTimeDataFormatter" sampleClass="org.jkiss.dbeaver.model.impl.data.TimeFormatSample">
+        <formatter id="time" label="%DateFormatter.time.label" class="org.jkiss.dbeaver.model.impl.data.formatters.DateTimeDataFormatter" sampleClass="org.jkiss.dbeaver.model.impl.data.formatters.TimeFormatSample">
             <propertyGroup label="%DateFormatter.time.general.label">
                 <property id="pattern" label="%DateFormatter.time.general.pattern.label" type="string" description="%DateFormatter.time.general.pattern.description" required="true"/>
             </propertyGroup>
         </formatter>
-        <formatter id="timestamp" label="%DateFormatter.timestamp.label" class="org.jkiss.dbeaver.model.impl.data.DateTimeDataFormatter" sampleClass="org.jkiss.dbeaver.model.impl.data.TimestampFormatSample">
+        <formatter id="timestamp" label="%DateFormatter.timestamp.label" class="org.jkiss.dbeaver.model.impl.data.formatters.DateTimeDataFormatter" sampleClass="org.jkiss.dbeaver.model.impl.data.formatters.TimestampFormatSample">
             <propertyGroup label="%DateFormatter.timestamp.general.label">
                 <property id="pattern" label="%DateFormatter.timestamp.general.pattern.label" type="string" description="%DateFormatter.timestamp.general.pattern.description" required="true"/>
             </propertyGroup>
         </formatter>
-        <formatter id="number" label="%DateFormatter.number.label" class="org.jkiss.dbeaver.model.impl.data.NumberDataFormatter" sampleClass="org.jkiss.dbeaver.model.impl.data.NumberFormatSample">
+        <formatter id="number" label="%DateFormatter.number.label" class="org.jkiss.dbeaver.model.impl.data.formatters.NumberDataFormatter" sampleClass="org.jkiss.dbeaver.model.impl.data.formatters.NumberFormatSample">
             <propertyGroup label="%DateFormatter.number.general.label">
                 <property id="useGrouping" label="%DateFormatter.number.general.grouping.label" type="boolean" description="%DateFormatter.number.general.grouping.description"/>
                 <property id="maxIntegerDigits" label="%DateFormatter.number.general.maxIntDigits.label" type="integer" description="%DateFormatter.number.general.maxIntDigits.description"/>

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/data/DBDBinaryFormatter.java

@@ -18,9 +18,9 @@
  */
 package org.jkiss.dbeaver.model.data;
 
-import org.jkiss.dbeaver.model.impl.data.BinaryFormatterBase64;
-import org.jkiss.dbeaver.model.impl.data.BinaryFormatterHex;
-import org.jkiss.dbeaver.model.impl.data.BinaryFormatterString;
+import org.jkiss.dbeaver.model.impl.data.formatters.BinaryFormatterBase64;
+import org.jkiss.dbeaver.model.impl.data.formatters.BinaryFormatterHex;
+import org.jkiss.dbeaver.model.impl.data.formatters.BinaryFormatterString;
 
 /**
  * Binary content presentation

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/data/BinaryFormatterBase64.java → plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/data/formatters/BinaryFormatterBase64.java

@@ -16,7 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-package org.jkiss.dbeaver.model.impl.data;
+package org.jkiss.dbeaver.model.impl.data.formatters;
 
 import org.jkiss.dbeaver.model.data.DBDBinaryFormatter;
 import org.jkiss.utils.Base64;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/data/BinaryFormatterHex.java → plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/data/formatters/BinaryFormatterHex.java

@@ -16,7 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-package org.jkiss.dbeaver.model.impl.data;
+package org.jkiss.dbeaver.model.impl.data.formatters;
 
 import org.jkiss.dbeaver.model.data.DBDBinaryFormatter;
 import org.jkiss.dbeaver.ui.editors.binary.HexUtils;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/data/BinaryFormatterString.java → plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/data/formatters/BinaryFormatterString.java

@@ -16,7 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-package org.jkiss.dbeaver.model.impl.data;
+package org.jkiss.dbeaver.model.impl.data.formatters;
 
 import org.jkiss.dbeaver.model.data.DBDBinaryFormatter;
 import org.jkiss.dbeaver.utils.ContentUtils;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/data/DateFormatSample.java → plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/data/formatters/DateFormatSample.java

@@ -16,7 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-package org.jkiss.dbeaver.model.impl.data;
+package org.jkiss.dbeaver.model.impl.data.formatters;
 
 import org.jkiss.dbeaver.model.data.DBDDataFormatterSample;
 

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/data/DateTimeDataFormatter.java → plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/data/formatters/DateTimeDataFormatter.java

@@ -16,7 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-package org.jkiss.dbeaver.model.impl.data;
+package org.jkiss.dbeaver.model.impl.data.formatters;
 
 import org.jkiss.dbeaver.model.data.DBDDataFormatter;
 import org.jkiss.utils.CommonUtils;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/data/DefaultDataFormatter.java → plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/data/formatters/DefaultDataFormatter.java

@@ -16,7 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-package org.jkiss.dbeaver.model.impl.data;
+package org.jkiss.dbeaver.model.impl.data.formatters;
 
 import org.jkiss.dbeaver.model.data.DBDDataFormatter;
 

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/data/NumberDataFormatter.java → plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/data/formatters/NumberDataFormatter.java

@@ -16,7 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-package org.jkiss.dbeaver.model.impl.data;
+package org.jkiss.dbeaver.model.impl.data.formatters;
 
 import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.model.data.DBDDataFormatter;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/data/NumberFormatSample.java → plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/data/formatters/NumberFormatSample.java

@@ -16,7 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-package org.jkiss.dbeaver.model.impl.data;
+package org.jkiss.dbeaver.model.impl.data.formatters;
 
 import org.jkiss.dbeaver.model.data.DBDDataFormatterSample;
 

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/data/TimeFormatSample.java → plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/data/formatters/TimeFormatSample.java

@@ -16,7 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-package org.jkiss.dbeaver.model.impl.data;
+package org.jkiss.dbeaver.model.impl.data.formatters;
 
 import org.jkiss.dbeaver.model.data.DBDDataFormatterSample;
 

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/data/TimestampFormatSample.java → plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/data/formatters/TimestampFormatSample.java

@@ -16,7 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-package org.jkiss.dbeaver.model.impl.data;
+package org.jkiss.dbeaver.model.impl.data.formatters;
 
 import org.jkiss.dbeaver.model.data.DBDDataFormatterSample;
 

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/jdbc/data/JDBCDateTimeValueHandler.java

@@ -33,7 +33,7 @@ import org.jkiss.dbeaver.model.exec.jdbc.JDBCSession;
 import org.jkiss.dbeaver.model.impl.data.editors.DateTimeEditorHelper;
 import org.jkiss.dbeaver.model.impl.data.editors.DateTimeInlineEditor;
 import org.jkiss.dbeaver.model.impl.data.editors.DateTimeStandaloneEditor;
-import org.jkiss.dbeaver.model.impl.data.DefaultDataFormatter;
+import org.jkiss.dbeaver.model.impl.data.formatters.DefaultDataFormatter;
 import org.jkiss.dbeaver.model.struct.DBSTypedObject;
 import org.jkiss.dbeaver.ui.properties.PropertySourceAbstract;
 

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/jdbc/data/JDBCNumberValueHandler.java

@@ -30,7 +30,7 @@ import org.jkiss.dbeaver.model.exec.jdbc.JDBCPreparedStatement;
 import org.jkiss.dbeaver.model.exec.jdbc.JDBCResultSet;
 import org.jkiss.dbeaver.model.exec.jdbc.JDBCSession;
 import org.jkiss.dbeaver.model.impl.data.editors.BitInlineEditor;
-import org.jkiss.dbeaver.model.impl.data.DefaultDataFormatter;
+import org.jkiss.dbeaver.model.impl.data.formatters.DefaultDataFormatter;
 import org.jkiss.dbeaver.model.impl.data.editors.NumberEditorHelper;
 import org.jkiss.dbeaver.model.impl.data.editors.NumberInlineEditor;
 import org.jkiss.dbeaver.model.struct.DBSTypedObject;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/DatabaseEditorInputFactory.java

@@ -125,8 +125,8 @@ public class DatabaseEditorInputFactory implements IElementFactory
                                     DBNNode node = DBeaverCore.getInstance().getNavigatorModel().getNodeByPath(monitor, nodePath);
                                     if (node != null) {
                                         Class<?> aClass = Class.forName(inputClass);
-                                        Constructor<?> constructor ;
-                                        for (Class nodeType = node.getClass(); ; nodeType = nodeType.getSuperclass()) {
+                                        Constructor<?> constructor = null;
+                                        for (Class nodeType = node.getClass(); nodeType != null; nodeType = nodeType.getSuperclass()) {
                                             try {
                                                 constructor = aClass.getConstructor(nodeType);
                                                 break;