Browse Source

Merge remote-tracking branch 'origin/master'

remotes/1611766341912730171/master
richie 5 years ago
parent
commit
f00200c21a
  1. 4
      src/main/java/com/fanruan/api/design/ui/container/BasicBeanPane.java
  2. 3
      src/main/java/com/fanruan/api/design/work/DatabaseConnectionPane.java
  3. 4
      src/main/java/com/fanruan/api/util/GeneralKit.java
  4. 13
      src/test/java/com/fanruan/api/plugin/PluginKitTest.java
  5. 12
      src/test/java/com/fanruan/api/plugin/TestExtraClass.java
  6. 1
      src/test/java/com/fanruan/api/util/ArrayKitTest.java
  7. 1
      src/test/java/com/fanruan/api/util/GeneralKitTest.java

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

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

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

@ -4,7 +4,6 @@ package com.fanruan.api.design.work;
import com.fanruan.api.design.ui.component.UIButton;
import com.fanruan.api.design.ui.component.UIComboBox;
import com.fanruan.api.design.ui.component.UILabel;
import com.fanruan.api.design.ui.container.BasicBeanPane;
import com.fanruan.api.log.LogKit;
import com.fanruan.api.macro.EncodeConstants;
import com.fanruan.api.util.ArrayKit;
@ -31,7 +30,7 @@ import java.awt.event.WindowEvent;
*
* @param <E> 数据连接类型
*/
public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connection> extends BasicBeanPane<Connection> {
public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connection> extends com.fr.design.beans.BasicBeanPane<Connection> {
private UILabel message;
private UIButton okButton;

4
src/main/java/com/fanruan/api/util/GeneralKit.java

@ -4,6 +4,7 @@ import com.fr.base.FRContext;
import com.fr.general.ComparatorUtils;
import com.fr.general.GeneralUtils;
import com.fr.stable.CommonUtils;
import com.fr.stable.StringUtils;
import com.fr.third.guava.base.Objects;
import com.fr.stable.StableUtils;
import org.jetbrains.annotations.NotNull;
@ -83,7 +84,7 @@ public class GeneralKit {
public static String join(Object[] array, String se) {
return StableUtils.join(array, se);
}
/*
/**
* 返回国际化区属
* @return 国际化后区域属性
*/
@ -91,4 +92,5 @@ public class GeneralKit {
public static Locale getLocale() {
return FRContext.getLocale();
}
}

13
src/test/java/com/fanruan/api/plugin/PluginKitTest.java

@ -0,0 +1,13 @@
package com.fanruan.api.plugin;
import org.junit.Assert;
import org.junit.Test;
public class PluginKitTest {
@Test
public void getArray(){
PluginKit p1 = new PluginKit();
TestExtraClass p2 = new TestExtraClass();
Assert.assertEquals(p1.getArray("abcd"), p2.getArray("abcd"));
}
}

12
src/test/java/com/fanruan/api/plugin/TestExtraClass.java

@ -0,0 +1,12 @@
package com.fanruan.api.plugin;
import com.fr.plugin.injectable.PluginSingleInjection;
public class TestExtraClass extends com.fr.plugin.AbstractExtraClassManager{
protected boolean mountSpecific(PluginSingleInjection injection){
return true;
}
protected boolean demountSpecific(PluginSingleInjection injection){
return true;
}
}

1
src/test/java/com/fanruan/api/util/ArrayKitTest.java

@ -3,7 +3,6 @@ package com.fanruan.api.util;
import com.fanruan.api.Prepare;
import java.util.*;
import com.fr.third.org.apache.poi.hssf.record.formula.functions.Int;
import org.junit.Assert;
import org.junit.Test;

1
src/test/java/com/fanruan/api/util/GeneralKitTest.java

@ -2,6 +2,7 @@ package com.fanruan.api.util;
import com.fanruan.api.Prepare;
import com.fr.general.GeneralUtils;
import com.fr.stable.AssistUtils;
import org.junit.Assert;
import org.junit.Test;

Loading…
Cancel
Save