Usability improvements when editing cells containing xml or json

.gitignore

@@ -34,7 +34,7 @@ local.properties
 
 target/
 .idea/
-config/
+logs/
 *.iml
 
 # project specific

README.md

@@ -13,6 +13,28 @@ To get started, begin here:
 3. If you have any problems read the [FAQ](https://github.com/NiceSystems/hrider/wiki/FAQ) first.
 
 ## News
+### 23 June, 2013: Release 1.0.7.2 available
+Issues fixed: [#45](https://github.com/NiceSystems/hrider/issues/45), [#46](https://github.com/NiceSystems/hrider/issues/46)
+
+[Download for hbase 0.94.1 - with dependencies](http://bit.ly/14R3Pdv).
+
+[Download for hbase 0.94.1 - without dependencies](http://bit.ly/1a3YF1A).
+### 18 June, 2013: Release 1.0.7.1 available
+Issues fixed: [#41](https://github.com/NiceSystems/hrider/issues/41), [#43](https://github.com/NiceSystems/hrider/issues/43), [#44](https://github.com/NiceSystems/hrider/issues/44)
+
+[Download for hbase 0.94.1](http://bit.ly/11Iesdr).
+### 19 May, 2013: Release 1.0.7.0 available
+New features: [#38](https://github.com/NiceSystems/hrider/issues/38)
+
+Issues fixed: [#36](https://github.com/NiceSystems/hrider/issues/36), [#39](https://github.com/NiceSystems/hrider/issues/39)
+
+[Download for hbase 0.94.1](http://bit.ly/19PgWvd).
+### 21 April, 2013: Release 1.0.6.0 available
+New features: [#34](https://github.com/NiceSystems/hrider/issues/34), [#35](https://github.com/NiceSystems/hrider/issues/35)
+
+Issues fixed: [#31](https://github.com/NiceSystems/hrider/issues/31)
+
+[Download for hbase 0.94.1](http://bit.ly/15uOEbu).
 ### 02 April, 2013: Release 1.0.5.0 available
 New features: [#28](https://github.com/NiceSystems/hrider/issues/28)
 

pom.xml

@@ -10,11 +10,11 @@
     <description>hbase viewer and editor</description>
 
     <packaging>jar</packaging>
-    <version>1.0.5.0</version>
+    <version>1.0.7.2</version>
 
     <repositories>
         <repository>
-            <id>local</id>
+            <id>localrepository</id>
             <url>file://${project.basedir}/repo</url>
         </repository>
         <repository>
@@ -91,6 +91,12 @@
             <artifactId>forms_rt</artifactId>
             <version>7.0.3</version>
         </dependency>
+        <dependency>
+            <groupId>com.sun</groupId>
+            <artifactId>tools</artifactId>
+            <scope>compile</scope>
+            <version>1.6</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -128,8 +134,8 @@
                             <classpathPrefix>lib/</classpathPrefix>
                         </manifest>
                         <manifestEntries>
-                            <artifactId>${project.artifactId}</artifactId>
                             <version>${project.version}</version>
+                            <hbaseVersion>${hbase.version}</hbaseVersion>
                         </manifestEntries>
                     </archive>
                 </configuration>

repo/com/sun/tools/1.6/_maven.repositories

@@ -0,0 +1,4 @@
+#NOTE: This is an internal implementation file, its format can be changed without prior notice.
+#Thu Apr 18 18:52:10 IDT 2013
+tools-1.6.jar>=
+tools-1.6.pom>=

repo/com/sun/tools/1.6/tools-1.6.pom

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.sun</groupId>
+  <artifactId>tools</artifactId>
+  <version>1.6</version>
+  <description>POM was created from install:install-file</description>
+</project>

repo/com/sun/tools/maven-metadata-local.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <groupId>com.sun</groupId>
+  <artifactId>tools</artifactId>
+  <versioning>
+    <release>1.6</release>
+    <versions>
+      <version>1.6</version>
+    </versions>
+    <lastUpdated>20130418155210</lastUpdated>
+  </versioning>
+</metadata>

src/main/java/hrider/actions/Action.java

@@ -0,0 +1,41 @@
+package hrider.actions;
+
+/**
+ * Copyright (C) 2012 NICE Systems ltd.
+ * <p/>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @author Igor Cher
+ * @version %I%, %G%
+ *          <p/>
+ *          This class represents an executable delegate.
+ */
+public abstract class Action<R> {
+
+    /**
+     * Executes the action.
+     *
+     * @throws Exception Any error.
+     */
+    public abstract R run() throws Exception;
+
+    /**
+     * The method is called when the error occurred.
+     *
+     * @param ex The error.
+     */
+    @SuppressWarnings("NoopMethodInAbstractClass")
+    public void onError(Exception ex) {
+
+    }
+}

src/main/java/hrider/actions/RunnableAction.java

@@ -0,0 +1,150 @@
+package hrider.actions;
+
+import hrider.io.Log;
+import org.apache.commons.lang.time.StopWatch;
+
+/**
+ * Copyright (C) 2012 NICE Systems ltd.
+ * <p/>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @author Igor Cher
+ * @version %I%, %G%
+ *          <p/>
+ *          This class represents a runnable action.
+ */
+public class RunnableAction<R> implements Runnable {
+
+    //region Constants
+    private final static Log logger = Log.getLogger(RunnableAction.class);
+    //endregion
+
+    //region Variables
+    private String    name;
+    private Action<R> action;
+    private Thread    thread;
+    private boolean   isRunning;
+    private boolean   interrupted;
+    private R         result;
+    //endregion
+
+    //region Constructor
+    public RunnableAction(String name, Action<R> action) {
+        this.name = name;
+        this.action = action;
+    }
+    //endregion
+
+    //region Public Properties
+    public R getResult() {
+        return result;
+    }
+
+    public boolean isCompleted() {
+        return !isRunning && !interrupted;
+    }
+
+    public boolean isRunning() {
+        return isRunning;
+    }
+    //endregion
+
+    //region Public Methods
+    public static <R> RunnableAction<R> run(String name, Action<R> action) {
+        RunnableAction<R> runnableAction = new RunnableAction<R>(name, action);
+        runnableAction.start();
+
+        return runnableAction;
+    }
+
+    public static <R> R runAndWait(String name, Action<R> action, long timeout) {
+        RunnableAction<R> runnableAction = new RunnableAction<R>(name, action);
+        runnableAction.start();
+
+        runnableAction.waitOrAbort(timeout);
+        return runnableAction.result;
+    }
+
+    public void start() {
+        if (this.thread == null) {
+            this.thread = new Thread(this);
+            this.thread.setName(this.name);
+            this.thread.setDaemon(true);
+            this.thread.start();
+
+            this.isRunning = true;
+
+            logger.info("Action '%s' started.", this.name);
+        }
+    }
+
+    public void abort() {
+        if (this.isRunning) {
+            this.interrupted = true;
+
+            this.thread.interrupt();
+            this.thread = null;
+        }
+    }
+
+    public void waitUntil(long timeout) {
+        StopWatch stopWatch = new StopWatch();
+        stopWatch.start();
+
+        long localTimeout = timeout / 10;
+
+        while (this.isRunning) {
+            try {
+                Thread.sleep(localTimeout);
+
+                if (stopWatch.getTime() > timeout) {
+                    break;
+                }
+            }
+            catch (InterruptedException ignore) {
+            }
+        }
+
+        stopWatch.stop();
+    }
+
+    public void waitOrAbort(long timeout) {
+        waitUntil(timeout);
+
+        if (this.isRunning) {
+            abort();
+        }
+    }
+
+    @Override
+    public void run() {
+        try {
+            this.result = action.run();
+            this.isRunning = false;
+
+            logger.info("Action '%s' completed.", this.name);
+        }
+        catch (Exception e) {
+            this.isRunning = false;
+
+            if (this.interrupted) {
+                logger.info("Action '%s' aborted.", this.name);
+            }
+            else {
+                logger.info("Action '%s' failed.", this.name);
+                this.action.onError(e);
+            }
+        }
+    }
+    //endregion
+}

src/main/java/hrider/config/ClusterConfig.java

@@ -85,14 +85,14 @@ public <T> T getTableConfig(Class<T> clazz, String table) {
     /**
      * Gets a configuration data related to the specified table and a corresponding column.
      *
-     * @param clazz  The class that represents the type of the data to be returned.
-     * @param table  The name of the table.
-     * @param column The name of the column.
-     * @param <T>    The type of the data to be returned.
+     * @param clazz The class that represents the type of the data to be returned.
+     * @param table The name of the table.
+     * @param key   The key to identify the data.
+     * @param <T>   The type of the data to be returned.
      * @return The data of the specified type.
      */
-    public <T> T getTableConfig(Class<T> clazz, String table, String column) {
-        return get(clazz, String.format("table.%s.%s", table, column));
+    public <T> T getTableConfig(Class<T> clazz, String table, String key) {
+        return get(clazz, String.format("table.%s.%s", table, key));
     }
 
     /**
@@ -123,12 +123,12 @@ public void setTableConfig(String table, String value) {
     /**
      * Sets a configuration data for the specified table and column.
      *
-     * @param table  The name of the table.
-     * @param column The name of the column.
-     * @param value  The data to set.
+     * @param table The name of the table.
+     * @param key   The identifier of the value.
+     * @param value The data to set.
      */
-    public void setTableConfig(String table, String column, String value) {
-        set(String.format("table.%s.%s", table, column), value);
+    public void setTableConfig(String table, String key, String value) {
+        set(String.format("table.%s.%s", table, key), value);
         save();
     }
 

src/main/java/hrider/config/ConnectionDetails.java

@@ -1,10 +1,13 @@
 package hrider.config;
 
+import hrider.actions.Action;
+import hrider.actions.RunnableAction;
 import hrider.hbase.ConnectionManager;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.HBaseConfiguration;
 
 import java.io.IOException;
+import java.io.Serializable;
 
 /**
  * Copyright (C) 2012 NICE Systems ltd.
@@ -26,7 +29,11 @@
  *          <p/>
  *          This class represents a data to be used to connect to the hbase and zookeeper nodes.
  */
-public class ConnectionDetails {
+public class ConnectionDetails implements Serializable {
+
+    //region Constants
+    private static final long serialVersionUID = -5808921673890223877L;
+    //endregion
 
     //region Variables
     private ServerDetails zookeeper;
@@ -44,13 +51,17 @@ public void setZookeeper(ServerDetails zookeeper) {
 
     //region Public Methods
     public boolean canConnect() {
-        try {
-            ConnectionManager.create(this);
-            return true;
-        }
-        catch (IOException ignore) {
-            return false;
-        }
+        Boolean result = RunnableAction.runAndWait(
+            this.zookeeper.getHost(), new Action<Boolean>() {
+
+            @Override
+            public Boolean run() throws IOException {
+                ConnectionManager.create(ConnectionDetails.this);
+                return true;
+            }
+        }, GlobalConfig.instance().getConnectionCheckTimeout());
+
+        return result != null ? result : false;
     }
 
     public Configuration createConfig() {
@@ -59,6 +70,9 @@ public Configuration createConfig() {
         config.set("hbase.zookeeper.property.clientPort", this.zookeeper.getPort());
         config.set("hbase.client.retries.number", "3");
 
+//        config.set("hbase.security.authentication", "kerberos");
+//        config.set("hbase.rpc.engine", "org.apache.hadoop.hbase.ipc.SecureRpcEngine");
+
         return config;
     }