Merge pull request #14 in TC/finekit from ~ZHAOJUNZHE/finekit:master to master

* commit '3d0f568ed223c82684f5d49b3bccd5fdd5892095':
  覆盖xmlkit
  更新文件位置。
  update
  update
  update
  格式修改
  update:更新xmlkit
  feat:处理冲突。
  处理冲突
  feat: 依照pr进行修改。
  feat: ui组件的补充

pom.xml

@@ -168,4 +168,28 @@
             </resource>
         </resources>
     </build>
+    <repositories>
+        <repository>
+            <id>fanruan</id>
+            <name>fanruan</name>
+            <url>http://mvn.finedevelop.com/repository/maven-public/</url>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>always</updatePolicy>
+                <checksumPolicy>warn</checksumPolicy>
+            </snapshots>
+        </repository>
+    </repositories>
+    <pluginRepositories>
+        <pluginRepository>
+            <id>fanruan</id>
+            <name>fanruan</name>
+            <url>http://mvn.finedevelop.com/repository/maven-public/</url>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>always</updatePolicy>
+                <checksumPolicy>warn</checksumPolicy>
+            </snapshots>
+        </pluginRepository>
+    </pluginRepositories>
 </project>

src/main/java/com/fanruan/api/data/ConnectionKit.java

@@ -0,0 +1,16 @@
+package com.fanruan.api.data;
+import com.fr.data.impl.Connection;
+import com.fr.file.DatasourceManager;
+
+public class ConnectionKit {
+    /**
+     * 获取指定名字和指定类型的数据连接
+     * @param name 数据连接的名字
+     * @param type 类型
+     * @return 数据连接
+     *
+     */
+    public <T extends Connection> T getConnection(String name, Class<? extends Connection> type) {
+        return DatasourceManager.getInstance().getConnection(name, type);
+    }
+}

src/main/java/com/fanruan/api/data/connection/NameDatabaseConnection.java

@@ -0,0 +1,4 @@
+package com.fanruan.api.data.connection;
+
+public class NameDatabaseConnection extends com.fr.data.impl.NameDatabaseConnection{
+}

src/main/java/com/fanruan/api/design/ui/component/UIDescriptionTextArea.java

@@ -0,0 +1,4 @@
+package com.fanruan.api.design.ui.component;
+
+public class UIDescriptionTextArea extends com.fr.design.gui.itextarea.DescriptionTextArea{
+}

src/main/java/com/fanruan/api/design/ui/component/UIToolbar.java

@@ -0,0 +1,14 @@
+package com.fanruan.api.design.ui.component;
+
+import com.fr.design.gui.itoolbar.UIToolBarUI;
+
+public class UIToolbar extends com.fr.design.gui.itoolbar.UIToolbar{
+    public UIToolbar(){
+
+    }
+
+    public UIToolbar(int align) {
+        super(align);
+    }
+
+}

src/main/java/com/fanruan/api/design/ui/container/BasicBeanPane.java

@@ -0,0 +1,4 @@
+package com.fanruan.api.design.ui.container;
+
+public abstract class BasicBeanPane extends com.fr.design.beans.BasicBeanPane{
+}

src/main/java/com/fanruan/api/design/ui/container/BasicDialog.java

@@ -0,0 +1,36 @@
+package com.fanruan.api.design.ui.container;
+
+import com.fanruan.api.design.ui.container.BasicPane;
+
+import java.awt.*;
+
+public class BasicDialog extends com.fr.design.dialog.BasicDialog{
+    public BasicDialog(Dialog parent){
+        super(parent);
+    }
+
+    public BasicDialog(Dialog parent, BasicPane pane){
+        super(parent, pane);
+    }
+
+    public BasicDialog(Dialog parent, BasicPane pane, boolean isNeedButton){
+        super(parent, pane, isNeedButton);
+    }
+
+    public BasicDialog(Frame parent){
+        super(parent);
+    }
+
+    public BasicDialog(Frame parent, BasicPane pane){
+        super(parent, pane);
+    }
+
+    public BasicDialog(Frame parent, BasicPane pane, boolean isNedButtonPane){
+        super(parent, pane, isNedButtonPane);
+    }
+
+    @Override
+    public void checkValid(){
+
+    }
+}

src/main/java/com/fanruan/api/design/ui/container/DialogActionAdapter.java

@@ -0,0 +1,8 @@
+package com.fanruan.api.design.ui.container;
+import com.fr.design.layout.FRGUIPaneFactory;
+
+public class DialogActionAdapter extends com.fr.design.dialog.DialogActionAdapter{
+    public DialogActionAdapter(){
+
+    }
+}

src/main/java/com/fanruan/api/design/work/ConnectionComboBoxPanel.java

@@ -0,0 +1,9 @@
+package com.fanruan.api.design.work;
+
+import com.fr.data.impl.Connection;
+
+public class ConnectionComboBoxPanel extends com.fr.design.data.datapane.connect.ConnectionComboBoxPanel{
+    public ConnectionComboBoxPanel(Class<? extends Connection> cls) {
+        super(cls);
+    }
+}

src/main/java/com/fanruan/api/design/work/DatabaseConnectionPane.java

@@ -0,0 +1,7 @@
+package com.fanruan.api.design.work;
+
+
+import javax.swing.*;
+public abstract class DatabaseConnectionPane extends com.fr.design.data.datapane.connect.DatabaseConnectionPane{
+
+}