ソースを参照

解决与因使用1.8JDK中API导致与1.7JDK不兼容的问题

master
jacky6024 7年前
コミット
ea63a3a77f
  1. 2
      ureport2-console/.classpath
  2. 2
      ureport2-core/.classpath
  3. 5
      ureport2-core/.settings/org.eclipse.jdt.core.prefs
  4. 5
      ureport2-core/src/main/java/com/bstek/ureport/expression/function/OrderFunction.java

2
ureport2-console/.classpath

@ -28,7 +28,7 @@
<attribute name="org.eclipse.jst.component.nondependency" value=""/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>

2
ureport2-core/.classpath

@ -28,7 +28,7 @@
<attribute name="org.eclipse.jst.component.nondependency" value=""/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>

5
ureport2-core/.settings/org.eclipse.jdt.core.prefs

@ -1,7 +1,12 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning

5
ureport2-core/src/main/java/com/bstek/ureport/expression/function/OrderFunction.java

@ -17,6 +17,7 @@ package com.bstek.ureport.expression.function;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
import java.util.List;
@ -53,7 +54,7 @@ public class OrderFunction implements Function {
if(firstData instanceof ObjectListExpressionData){
ObjectListExpressionData data=(ObjectListExpressionData)firstData;
List<?> list=data.getData();
list.sort(new Comparator<Object>(){
Collections.sort(list, new Comparator<Object>(){
@Override
public int compare(Object data1, Object data2) {
return doOrder(data1, data2, order);
@ -70,7 +71,7 @@ public class OrderFunction implements Function {
ls.add(obj);
}
}
ls.sort(new Comparator<Object>(){
Collections.sort(ls,new Comparator<Object>(){
@Override
public int compare(Object data1, Object data2) {
return doOrder(data1, data2, order);

読み込み中…
キャンセル
保存