Browse Source

feat: 依照pr进行修改。

master
zjz1993 5 years ago
parent
commit
5fedc4240e
  1. 26
      src/main/java/com/fanruan/api/database/DatabaseKit.java
  2. 11
      src/main/java/com/fanruan/api/design/ui/container/SQLEditPane.java
  3. 5
      src/main/java/com/fanruan/api/design/ui/editor/Editor.java
  4. 2
      src/main/java/com/fanruan/api/design/work/ConnectionComboBoxPanel.java
  5. 2
      src/main/java/com/fanruan/api/design/work/DatabaseConnectionPane.java
  6. 4
      src/main/java/com/fanruan/api/redis/RedisKit.java
  7. 4
      src/main/java/com/fanruan/api/redis/pool/JedisPool.java
  8. 5
      src/main/java/com/fanruan/api/redis/pool/JedisPoolConfig.java
  9. 19
      src/main/java/com/fanruan/api/xml/XmlKit.java

26
src/main/java/com/fanruan/api/database/DatabaseKit.java

@ -1,26 +0,0 @@
package com.fanruan.api.database;
import com.fr.data.core.DataCoreXmlUtils;
import com.fr.data.impl.Connection;
import com.fr.stable.xml.XMLPrintWriter;
import com.fr.stable.xml.XMLableReader;
import com.fr.file.DatasourceManager;
public class DatabaseKit {
/**
* 读取connection对象
* @param reader XMLableReader对象
* @return Connection对象
*
*/
public static Connection readXMLConnectionMap(XMLableReader reader) {
return DataCoreXmlUtils.readXMLConnectionMap(reader);
}
/**
* 写connection对象
* @param writer XMLPrintWriter对象
* @param connection Connection对象
*/
public static void writeXMLConnection(XMLPrintWriter writer, Connection connection) {
DataCoreXmlUtils.writeXMLConnection(writer, connection);
}
}

11
src/main/java/com/fanruan/api/design/ui/container/SQLEditPane.java

@ -1,11 +0,0 @@
package com.fanruan.api.design.ui.container;
public class SQLEditPane extends com.fr.design.data.datapane.sqlpane.SQLEditPane{
public SQLEditPane(){
}
public SQLEditPane(boolean requestDroptarget) {
super(requestDroptarget);
}
}

5
src/main/java/com/fanruan/api/design/ui/editor/Editor.java

@ -1,5 +0,0 @@
package com.fanruan.api.design.ui.editor;
public abstract class Editor extends com.fr.design.editor.editor.Editor{
}

2
src/main/java/com/fanruan/api/design/ui/container/ConnectionComboBoxPanel.java → src/main/java/com/fanruan/api/design/work/ConnectionComboBoxPanel.java

@ -1,4 +1,4 @@
package com.fanruan.api.design.ui.container; package com.fanruan.api.design.work;
import com.fr.data.impl.Connection; import com.fr.data.impl.Connection;

2
src/main/java/com/fanruan/api/design/ui/container/DatabaseConnectionPane.java → src/main/java/com/fanruan/api/design/work/DatabaseConnectionPane.java

@ -1,4 +1,4 @@
package com.fanruan.api.design.ui.container; package com.fanruan.api.design.work;
import javax.swing.*; import javax.swing.*;

4
src/main/java/com/fanruan/api/redis/RedisKit.java

@ -1,4 +0,0 @@
package com.fanruan.api.redis;
public class RedisKit {
}

4
src/main/java/com/fanruan/api/redis/pool/JedisPool.java

@ -1,4 +0,0 @@
package com.fanruan.api.redis.pool;
public class JedisPool extends com.fr.third.redis.clients.jedis.JedisPool{
}

5
src/main/java/com/fanruan/api/redis/pool/JedisPoolConfig.java

@ -1,5 +0,0 @@
package com.fanruan.api.redis.pool;
import com.fr.ssh.jsch.Session;
public class JedisPoolConfig extends com.fr.third.redis.clients.jedis.JedisPoolConfig{
}

19
src/main/java/com/fanruan/api/xml/XmlKit.java

@ -1,5 +1,7 @@
package com.fanruan.api.xml; package com.fanruan.api.xml;
import com.fr.data.core.DataCoreXmlUtils;
import com.fr.data.impl.Connection;
import com.fr.stable.xml.*; import com.fr.stable.xml.*;
import com.fr.general.xml.GeneralXMLTools; import com.fr.general.xml.GeneralXMLTools;
@ -35,4 +37,21 @@ public class XmlKit {
public static void writeXMLable(XMLPrintWriter writer, XMLable xml, String tagName) { public static void writeXMLable(XMLPrintWriter writer, XMLable xml, String tagName) {
GeneralXMLTools.writeXMLable(writer, xml, tagName); GeneralXMLTools.writeXMLable(writer, xml, tagName);
} }
/**
* 读取connection对象
* @param reader XMLableReader对象
* @return Connection对象
*
*/
public static Connection readXMLConnectionMap(XMLableReader reader) {
return DataCoreXmlUtils.readXMLConnectionMap(reader);
}
/**
* 写connection对象
* @param writer XMLPrintWriter对象
* @param connection Connection对象
*/
public static void writeXMLConnection(XMLPrintWriter writer, Connection connection) {
DataCoreXmlUtils.writeXMLConnection(writer, connection);
}
} }

Loading…
Cancel
Save