Merge pull request #338 in BA/design from ~LOY/design_fr:dev to dev

* commit '18bd88c96519bc87eb403a21ec4b318ee5662eef':
  使用third中的poi

designer/src/com/fr/design/actions/file/export/AbstractExcelExportAction.java

@@ -36,7 +36,7 @@ public abstract class AbstractExcelExportAction extends AbstractExportAction {
     	if (hasLayerReport(tpl)) {
     		return "zip";
     	} else {
-    		return ExcelUtils.checkPOIJarExist() ? "xlsx" : "xls";
+    		return ExcelUtils.checkThirdJarSupportPOI() ? "xlsx" : "xls";
     	}
     }
 }

designer/src/com/fr/design/widget/ui/IframeEditorDefinePane.java

@@ -22,7 +22,6 @@ import com.fr.form.ui.IframeEditor;
 import com.fr.general.Inter;
 import com.fr.stable.ParameterProvider;
 import com.fr.design.widget.DataModify;
-import com.fr.third.org.apache.poi.hssf.record.formula.functions.Abs;
 
 public class IframeEditorDefinePane extends AbstractDataModify<IframeEditor> {
 	private UITextField srcTextField;

designer_chart/src/com/fr/design/chart/series/PlotSeries/MapDefiAreaNamePane.java

@@ -36,7 +36,6 @@ import com.fr.design.gui.xcombox.ComboBoxUseEditor;
 import com.fr.design.editor.editor.Editor;
 import com.fr.design.editor.editor.TextEditor;
 import com.fr.general.Inter;
-import com.fr.third.org.apache.poi.hssf.record.formula.functions.T;
 
 /**
  * 地图, 定义区域名.
@@ -90,7 +89,7 @@ public class MapDefiAreaNamePane extends BasicBeanPane<String> implements Abstrc
 		tableDataBox.setPreferredSize(new Dimension(200, 20));
 		northPane.add(tableDataBox);
 
-		columnBox = new FilterComboBox<T>();
+		columnBox = new FilterComboBox();
 		columnBox.setPreferredSize(new Dimension(40, 20));
 		columnBox.addItemListener(columnChange);
 

designer_chart/src/com/fr/design/mainframe/actions/ExcelExportAction4Chart.java

@@ -58,7 +58,7 @@ public class ExcelExportAction4Chart extends AbstractExportAction4JChart {
 
     @Override
 	protected String getDefaultExtension() {
-    	return ExcelUtils.checkPOIJarExist() ? "xlsx" : "xls";
+    	return ExcelUtils.checkThirdJarSupportPOI() ? "xlsx" : "xls";
     }
 
     @Override

designer_chart/src/com/fr/design/mainframe/exporter/ExcelExporter4Chart.java

@@ -6,14 +6,14 @@ import com.fr.design.mainframe.JChart;
 import com.fr.general.FRLogger;
 import com.fr.general.IOUtils;
 import com.fr.stable.CoreGraphHelper;
-import org.apache.poi.hssf.usermodel.HSSFClientAnchor;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.ClientAnchor;
-import org.apache.poi.ss.usermodel.Drawing;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.xssf.usermodel.XSSFClientAnchor;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import com.fr.third.v2.org.apache.poi.hssf.usermodel.HSSFClientAnchor;
+import com.fr.third.v2.org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import com.fr.third.v2.org.apache.poi.ss.usermodel.ClientAnchor;
+import com.fr.third.v2.org.apache.poi.ss.usermodel.Drawing;
+import com.fr.third.v2.org.apache.poi.ss.usermodel.Sheet;
+import com.fr.third.v2.org.apache.poi.ss.usermodel.Workbook;
+import com.fr.third.v2.org.apache.poi.xssf.usermodel.XSSFClientAnchor;
+import com.fr.third.v2.org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import java.awt.*;
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayOutputStream;
@@ -73,7 +73,7 @@ public class ExcelExporter4Chart extends ImageExporter4Chart {
     }
 
     private boolean checkExcelExportVersion() {
-        return ExcelUtils.checkPOIJarExist();
+        return ExcelUtils.checkThirdJarSupportPOI();
     }
     	// 加载图片.
 	private int loadPicture(BufferedImage bufferedImage)throws IOException {