Merge branch 'master' of zhaojunzhe/demo-tabledata-redis into master

src/main/java/com/fr/plugin/db/redis/core/DataWrapper.java

@@ -6,6 +6,7 @@ import com.fanruan.api.util.IOKit;
 import com.fanruan.api.script.ScriptKit;
 import com.fanruan.api.util.StringKit;
 import com.fr.workspace.WorkContext;
+import com.fanruan.api.runtime.EnvKit;
 
 import javax.script.ScriptEngine;
 import javax.script.ScriptException;
@@ -98,6 +99,6 @@ public class DataWrapper<T> {
     }
 
     private String readAndRenderScriptFile(String filePath) {
-        return filePath.replaceFirst("\\$ENV_HOME", WorkContext.getCurrent().getPath());
+        return filePath.replaceFirst("\\$ENV_HOME", EnvKit.getCurrent().getPath());
     }
 }

src/main/java/com/fr/plugin/db/redis/core/RedisDatabaseConnection.java

@@ -8,7 +8,7 @@ import com.fanruan.api.i18n.I18nKit;
 import com.fr.plugin.db.redis.core.emb.Redis;
 import com.fanruan.api.security.SecurityKit;
 import com.fanruan.api.util.ArrayKit;
-import com.fanruan.api.util.ReflectKit;
+import com.fanruan.api.util.TypeKit;
 import com.fanruan.api.util.StringKit;
 import com.fr.stable.xml.XMLPrintWriter;
 import com.fr.stable.xml.XMLableReader;
@@ -105,7 +105,7 @@ public class RedisDatabaseConnection extends AbstractDatabaseConnection {
     @Override
     public void addConnection(List<String> list, String connectionName, Class<? extends Connection>[] acceptTypes) {
         for (Class<? extends com.fr.data.impl.Connection> accept : acceptTypes) {
-            if (ReflectKit.classInstanceOf(getClass(), accept)) {
+            if (TypeKit.classInstanceOf(getClass(), accept)) {
                 list.add(connectionName);
                 break;
             }

src/main/java/com/fr/plugin/db/redis/core/RedisScriptTableData.java

@@ -7,7 +7,7 @@ import com.fr.config.holder.factory.XmlHolders;
 import com.fr.data.AbstractParameterTableData;
 import com.fanruan.api.xml.XmlKit;
 import com.fr.data.impl.Connection;
-import com.fanruan.api.database.nameDatabase.NameDatabaseConnection;
+import com.fanruan.api.database.nameDatabase.NameReference;
 import com.fanruan.api.data.ConnectionKit;
 import com.fr.general.data.DataModel;
 import com.fanruan.api.xml.XmlKit;
@@ -77,8 +77,8 @@ public class RedisScriptTableData extends AbstractParameterTableData {
         long start = System.currentTimeMillis();
         Parameter[] ps = Parameter.providers2Parameter(getParameters(calculator));
         Connection connection = database.get();
-        if (connection instanceof NameDatabaseConnection) {
+        if (connection instanceof NameReference) {
-            String name = ((NameDatabaseConnection) connection).getName();
+            String name = ((NameReference) connection).getName();
             RedisDatabaseConnection rc = ConnectionKit.getConnection(name, RedisDatabaseConnection.class);
             if (rc != null) {
                 OrderValue orderValue = dbIndex.get();

src/main/java/com/fr/plugin/db/redis/core/RedisTableData.java

@@ -7,7 +7,7 @@ import com.fr.config.holder.factory.XmlHolders;
 import com.fr.data.AbstractParameterTableData;
 import com.fanruan.api.xml.XmlKit;
 import com.fr.data.impl.Connection;
-import com.fanruan.api.database.nameDatabase.NameDatabaseConnection;
+import com.fanruan.api.database.nameDatabase.NameReference;
 import com.fanruan.api.data.ConnectionKit;
 import com.fr.general.data.DataModel;
 import com.fanruan.api.xml.XmlKit;
@@ -87,8 +87,8 @@ public class RedisTableData extends AbstractParameterTableData {
         long start = System.currentTimeMillis();
         Parameter[] ps = Parameter.providers2Parameter(getParameters(calculator));
         Connection connection = database.get();
-        if (connection instanceof NameDatabaseConnection) {
+        if (connection instanceof NameReference) {
-            String name = ((NameDatabaseConnection) connection).getName();
+            String name = ((NameReference) connection).getName();
             RedisDatabaseConnection rc = ConnectionKit.getConnection(name, RedisDatabaseConnection.class);
             if (rc != null) {
                 OrderValue orderValue = dbIndex.get();

src/main/java/com/fr/plugin/db/redis/core/RedisTableDataModel.java

@@ -3,8 +3,7 @@ package com.fr.plugin.db.redis.core;
 import com.fr.stable.ParameterProvider;
 import com.fr.data.AbstractDataModel;
 import com.fanruan.api.log.LogKit;
-import com.fr.plugin.PluginLicense;
+import com.fanruan.api.runtime.PluginKit;
-import com.fr.plugin.PluginLicenseManager;
 import com.fr.plugin.db.redis.core.emb.Redis;
 import com.fr.plugin.db.redis.core.visit.VisitorFactory;
 import com.fr.plugin.db.redis.util.RedisUtils;
@@ -19,8 +18,7 @@ public class RedisTableDataModel extends AbstractDataModel {
     private List<List<Object>> data;
 
     public RedisTableDataModel(Calculator calculator, Parameter[] ps, RedisDatabaseConnection mc, int dbIndex, String query, String script, int rowCount) {
-        PluginLicense pluginLicense = PluginLicenseManager.getInstance().getPluginLicenseByID(RedisConstants.PLUGIN_ID);
+        if (PluginKit.isCurrentPluginAvailable()) {
-        if (pluginLicense.isAvailable()) {
             initRedisData(calculator, ps, mc, dbIndex, query, script, rowCount);
         } else {
             throw new RuntimeException("Redis Plugin License Expired!");

src/main/java/com/fr/plugin/db/redis/core/pool/RedisConnectionPoolConfig.java

@@ -5,7 +5,6 @@ import com.fanruan.api.conf.BaseConfiguration;
 import com.fanruan.api.conf.HolderKit;
 import com.fr.config.holder.Conf;
 
-import javax.xml.ws.Holder;
 
 /**
  * @author richie

src/main/java/com/fr/plugin/db/redis/help/Files.java

@@ -2,7 +2,7 @@ package com.fr.plugin.db.redis.help;
 
 import com.eclipsesource.v8.V8;
 import com.fanruan.api.util.IOKit;
-import com.fanruan.api.consts.EncodeConstantsKit;
+import com.fanruan.api.macro.EncodeConstants;
 
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
@@ -25,7 +25,7 @@ public class Files {
         InputStream in = IOKit.read(filePath);
         if (in != null) {
             try {
-                v8.executeVoidScript(IOKit.inputStream2String(in, EncodeConstantsKit.ENCODING_UTF_8));
+                v8.executeVoidScript(IOKit.inputStream2String(in, EncodeConstants.ENCODING_UTF_8));
             } catch (UnsupportedEncodingException ignore) {
 
             }

src/main/java/com/fr/plugin/db/redis/ui/RedisBaseTableDataPane.java

@@ -13,6 +13,7 @@ import com.fanruan.api.design.ui.component.table.UITableEditorPane;
 import com.fanruan.api.design.ui.component.UIToolbar;
 import com.fanruan.api.design.DesignKit;
 import com.fr.design.menu.ToolBarDef;
+import com.fanruan.api.design.ui.toolbar.ToolBarDef;
 import com.fr.plugin.db.redis.core.order.OrderValue;
 import com.fanruan.api.util.ArrayKit;
 import com.fr.stable.ParameterProvider;

src/main/java/com/fr/plugin/db/redis/ui/RedisQueryPane.java

@@ -12,7 +12,7 @@ import com.fr.design.gui.itextarea.DescriptionTextArea;
 import com.fanruan.api.design.ui.component.code.UISyntaxTextArea;
 import com.fanruan.api.design.ui.component.code.SyntaxConstants;
 import com.fanruan.api.design.DesignKit;
-import com.fr.general.SiteCenter;
+import com.fanruan.api.net.CloudKit;
 import com.fr.plugin.db.redis.core.order.OrderValue;
 import com.fr.plugin.db.redis.ui.value.IndexValuePaneFactory;
 import com.fr.plugin.db.redis.util.RedisDesignUtils;
@@ -44,7 +44,7 @@ public class RedisQueryPane extends BasicPane {
             @Override
             public void actionPerformed(ActionEvent e) {
                 try {
-                    Desktop.getDesktop().browse(URI.create(SiteCenter.getInstance().acquireUrlByKind("help.redis")));
+                    Desktop.getDesktop().browse(URI.create(CloudKit.acquireUrlByKind("help.redis")));
                 } catch (IOException e1) {
                     LogKit.error(e1.getMessage(), e1);
                 }

src/main/java/com/fr/plugin/db/redis/ui/RedisScriptTableDataPane.java

@@ -1,6 +1,6 @@
 package com.fr.plugin.db.redis.ui;
 
-import com.fanruan.api.database.nameDatabase.NameDatabaseConnection;
+import com.fanruan.api.database.nameDatabase.NameReference;
 import com.fr.plugin.db.redis.core.RedisScriptTableData;
 import com.fr.plugin.db.redis.core.order.OrderValue;
 import com.fr.script.Calculator;
@@ -62,7 +62,7 @@ public class RedisScriptTableDataPane extends RedisBaseTableDataPane<RedisScript
         RedisScriptTableData tableData = new RedisScriptTableData();
         String connectionName = chosePane.getSelectRedisConnectionName();
         if (StringKit.isNotEmpty(connectionName)) {
-            tableData.setDatabase(new NameDatabaseConnection(connectionName));
+            tableData.setDatabase(new NameReference(connectionName));
         }
         List<ParameterProvider> parameterList = editorPane.update();
         ParameterProvider[] parameters = parameterList.toArray(new ParameterProvider[parameterList.size()]);

src/main/java/com/fr/plugin/db/redis/ui/RedisTableDataPane.java

@@ -1,7 +1,7 @@
 package com.fr.plugin.db.redis.ui;
 
 import com.fanruan.api.design.DesignKit;
-import com.fanruan.api.database.nameDatabase.NameDatabaseConnection;
+import com.fanruan.api.database.nameDatabase.NameReference;
 import com.fr.plugin.db.redis.core.RedisTableData;
 import com.fr.plugin.db.redis.core.order.OrderValue;
 import com.fr.script.Calculator;
@@ -69,7 +69,7 @@ public class RedisTableDataPane extends RedisBaseTableDataPane<RedisTableData> {
 
         String connectionName = chosePane.getSelectRedisConnectionName();
         if (StringKit.isNotEmpty(connectionName)) {
-            tableData.setDatabase(new NameDatabaseConnection(connectionName));
+            tableData.setDatabase(new NameReference(connectionName));
         }
 
         List<ParameterProvider> parameterList = editorPane.update();

src/main/java/com/fr/plugin/db/redis/ui/value/IntegerEditor.java

@@ -6,7 +6,7 @@ import com.fanruan.api.design.ui.component.UIIntNumberField;
 import com.fanruan.api.design.ui.component.UITextField;
 import com.fanruan.api.design.util.GUICoreKit;
 import com.fr.plugin.db.redis.core.order.impl.NumberOrderValue;
-import com.fr.stable.StringUtils;
+import com.fanruan.api.util.StringKit;
 
 import java.awt.*;
 import java.awt.event.KeyAdapter;
@@ -19,7 +19,7 @@ public class IntegerEditor extends Editor<NumberOrderValue> {
     private static final long serialVersionUID = 1L;
     protected UIIntNumberField numberField; // text field.
 
-    protected String oldValue = StringUtils.EMPTY;
+    protected String oldValue = StringKit.EMPTY;
 
     /**
      * Constructor.