Merge branch 'release' of http://www.finedevelop.com:2015/scm/ba/design into release

designer_base/src/com/fr/design/RestartHelper.java

@@ -4,15 +4,11 @@ import com.fr.design.mainframe.DesignerContext;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.FRLogger;
 import com.fr.general.GeneralUtils;
-import com.fr.stable.ArrayUtils;
+import com.fr.stable.*;
-import com.fr.stable.OperatingSystem;
+
-import com.fr.stable.StableUtils;
+import java.io.*;
-import com.fr.stable.StringUtils;
+import java.nio.channels.FileChannel;
-
+import java.nio.channels.FileLock;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -153,6 +149,18 @@ public class RestartHelper {
         }
 
         try {
+            try {
+                File restartLockFile = new File(StableUtils.pathJoin(StableUtils.getInstallHome(), "restart.lock"));
+                StableUtils.makesureFileExist(restartLockFile);
+                RandomAccessFile randomAccessFile = new RandomAccessFile(restartLockFile,"rw");
+                FileChannel restartLockFC = randomAccessFile.getChannel();
+                FileLock restartLock = restartLockFC.tryLock();
+                if(restartLock == null) {
+                    FRLogger.getLogger().error("restart lock null!");
+                }
+            }catch (Exception e){
+                FRLogger.getLogger().error(e.getMessage());
+            }
             if (OperatingSystem.isMacOS()) {
                 restartInMacOS(installHome, filesToBeDelete);
             } else {

designer_base/src/com/fr/design/beans/location/MoveUtils.java

@@ -300,13 +300,15 @@ public class MoveUtils {
 			findX(px, bounds, left, right, width);
 			findY(py, bounds, top, bottom, height);
 
-			if(isIntersects && !isParameterLayout){
+			if(!isParameterLayout){
+				if(isIntersects) {
 					isWidgetsIntersects = true;
 				}
 				else{
 					findEquidistantLine(bounds, left, top, height, width);
 				}
 			}
+		}
 		showForbiddenWindow(designer, x, y, isWidgetsIntersects);
 
 		createXAbsorptionline(px, designer, width, cacheRecs);

designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java

@@ -48,6 +48,9 @@ import java.util.Map;
  */
 public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraChartDesignClassManagerProvider {
 
+
+
+
     private static ClassLoader loader = Thread.currentThread().getContextClassLoader();
 
     private static ChartTypeInterfaceManager classManager = null;

designer_chart/src/com/fr/design/mainframe/chart/ChartEditPane.java

@@ -115,6 +115,11 @@ public class ChartEditPane extends BasicPane implements AttributeChange,Prepare4
             AbstractChartAttrPane selectedPane = paneList.get(tabsHeaderIconPane.getSelectedIndex());
             selectedPane.update(collection);
             if (!ComparatorUtils.equals(collection, lastCollection)) {
+
+                //此处画图
+                Chart chart = collection.getSelectedChart();
+                chart.demoImgEvent(true);
+
                 try {
                     lastCollection = (ChartCollection) collection.clone();
                 } catch (CloneNotSupportedException e) {

designer_form/build.gradle

@@ -31,12 +31,15 @@ def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf ('\\'))
 buildDir=buildDir.substring(0,buildDir.lastIndexOf ('\\'))
 def branchName=buildDir.substring(buildDir.lastIndexOf ('\\')+1)
 
+<<<<<<< HEAD
 FileTree jars=fileTree(dir:'../../../').include "finereport-*-stable/${branchName}/**/*.jar"
 jars.each{File file->
 println "-----------this jar path is ${file.path}----------"
 }
 
 
+=======
+>>>>>>> adaabb5817789ef492696721df369702adeb9971
 //ÉùÃ÷ÍⲿÒÀÀµ
 dependencies{
 compile fileTree(dir:'../../../finereport-lib-stable',include:'**/*.jar')
@@ -69,6 +72,7 @@ task copyFile(type:Copy,dependsOn:compileJava){
 task compressJS{
 	ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){
 		classpath {
+
 			fileset(dir:'../../../finereport-lib4build-stable',includes:'**/*.jar')
 		}
 	}

designer_form/src/com/fr/design/gui/core/FormWidgetOption.java

@@ -1 +1 @@
-package com.fr.design.gui.core;

import javax.swing.Icon;

import com.fr.base.BaseUtils;
import com.fr.form.ui.ElementCaseEditor;
import com.fr.form.ui.Widget;
import com.fr.form.ui.container.WAbsoluteLayout;
import com.fr.form.ui.container.WBorderLayout;
import com.fr.form.ui.container.WCardLayout;
import com.fr.form.ui.container.WFitLayout;
import com.fr.form.ui.container.WHorizontalBoxLayout;
import com.fr.form.ui.container.WParameterLayout;
import com.fr.form.ui.container.WVerticalBoxLayout;
import com.fr.general.Inter;

/**
 * Author : Shockway
 * Date: 13-6-17
 * Time: 上午10:40
 */
public class FormWidgetOption extends WidgetOption {
	
	/**
	 * 返回名字
	 * @return 名字
	 */
	@Override
	public String optionName() {
		return null;
	}

	/**
	 * 返回图标
	 * @return 图标
	 */
	@Override
	public Icon optionIcon() {
		return null;
	}

	/**
	 * 组件类
	 * @return 类
	 */
	@Override
	public Class<? extends Widget> widgetClass() {
		return null;
	}

	/**
	 * 返回组件
	 * @return 控件
	 */
	@Override
	public Widget createWidget() {
		return null;
	}

	/*
	 * 表单容器
	 */
	public static WidgetOption[] getFormContainerInstance() {
		return new WidgetOption[] { ABSOLUTELAYOUTCONTAINER, BORDERLAYOUTCONTAINER, HORIZONTALBOXLAYOUTCONTAINER, VERTICALBOXLAYOUTCONTAINER,
				CARDLAYOUTCONTAINER, FITLAYOUTCONTAINER };
	}

    /**
     * 表单工具栏上的布局
     * @return   控件
     */
    public static WidgetOption[] getFormLayoutInstance() {
        return new WidgetOption[] {CARDLAYOUTCONTAINER, ABSOLUTELAYOUTCONTAINER};
    }

	public static final WidgetOption ABSOLUTELAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter
			.getLocText("FR-Designer_AbsoluteLayout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/layout_absolute.png"),
			WAbsoluteLayout.class);

	public static final WidgetOption BORDERLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter
			.getLocText("FR-Designer_BorderLayout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/layout_border.png"),
			WBorderLayout.class);

	public static final WidgetOption CARDLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter
			.getLocText("FR-Designer_CardLayout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/card_layout_16.png"),
			WCardLayout.class);

	public static final WidgetOption HORIZONTALBOXLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter
			.getLocText("FR-Designer_Layout-HBox"), BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_h_16.png"),
			WHorizontalBoxLayout.class);

	public static final WidgetOption VERTICALBOXLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter
			.getLocText("FR-Designer_VerticalBoxLayout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_v_16.png"),
			WVerticalBoxLayout.class);
	
	public static final WidgetOption FITLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter.getLocText("FR-Designer-Layout_Adaptive_Layout"), 
			BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_v_16.png"),
			WFitLayout.class);

	public static final WidgetOption PARAMETERCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter
			.getLocText("FR-Designer_Para-Body"), BaseUtils.readIcon("/com/fr/web/images/form/resources/layout_parameter.png"),
			WParameterLayout.class);
	
	public static final WidgetOption ELEMENTCASE = WidgetOptionFactory.createByWidgetClass(Inter
			.getLocText("FR-Designer_Form-Report"), BaseUtils.readIcon("/com/fr/web/images/form/resources/report_16.png"),
			ElementCaseEditor.class);
}
+package com.fr.design.gui.core;

import javax.swing.Icon;

import com.fr.base.BaseUtils;
import com.fr.form.ui.ElementCaseEditor;
import com.fr.form.ui.Widget;
import com.fr.form.ui.container.WAbsoluteLayout;
import com.fr.form.ui.container.WBorderLayout;
import com.fr.form.ui.container.WCardLayout;
import com.fr.form.ui.container.WFitLayout;
import com.fr.form.ui.container.WHorizontalBoxLayout;
import com.fr.form.ui.container.WParameterLayout;
import com.fr.form.ui.container.WVerticalBoxLayout;
import com.fr.general.Inter;

/**
 * Author : Shockway
 * Date: 13-6-17
 * Time: 上午10:40
 */
public class FormWidgetOption extends WidgetOption {
	
	/**
	 * 返回名字
	 * @return 名字
	 */
	@Override
	public String optionName() {
		return null;
	}

	/**
	 * 返回图标
	 * @return 图标
	 */
	@Override
	public Icon optionIcon() {
		return null;
	}

	/**
	 * 组件类
	 * @return 类
	 */
	@Override
	public Class<? extends Widget> widgetClass() {
		return null;
	}

	/**
	 * 返回组件
	 * @return 控件
	 */
	@Override
	public Widget createWidget() {
		return null;
	}

	/*
	 * 表单容器
	 */
	public static WidgetOption[] getFormContainerInstance() {
		return new WidgetOption[] { ABSOLUTELAYOUTCONTAINER, BORDERLAYOUTCONTAINER, HORIZONTALBOXLAYOUTCONTAINER, VERTICALBOXLAYOUTCONTAINER,
				CARDLAYOUTCONTAINER, FITLAYOUTCONTAINER };
	}

    /**
     * 表单工具栏上的布局
     * @return   控件
     */
    public static WidgetOption[] getFormLayoutInstance() {
        return new WidgetOption[] {CARDLAYOUTCONTAINER/*, ABSOLUTELAYOUTCONTAINER*/};
    }

	public static final WidgetOption ABSOLUTELAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter
			.getLocText("FR-Designer_AbsoluteLayout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/layout_absolute.png"),
			WAbsoluteLayout.class);

	public static final WidgetOption BORDERLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter
			.getLocText("FR-Designer_BorderLayout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/layout_border.png"),
			WBorderLayout.class);

	public static final WidgetOption CARDLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter
			.getLocText("FR-Designer_CardLayout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/card_layout_16.png"),
			WCardLayout.class);

	public static final WidgetOption HORIZONTALBOXLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter
			.getLocText("FR-Designer_Layout-HBox"), BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_h_16.png"),
			WHorizontalBoxLayout.class);

	public static final WidgetOption VERTICALBOXLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter
			.getLocText("FR-Designer_VerticalBoxLayout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_v_16.png"),
			WVerticalBoxLayout.class);
	
	public static final WidgetOption FITLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter.getLocText("FR-Designer-Layout_Adaptive_Layout"), 
			BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_v_16.png"),
			WFitLayout.class);

	public static final WidgetOption PARAMETERCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter
			.getLocText("FR-Designer_Para-Body"), BaseUtils.readIcon("/com/fr/web/images/form/resources/layout_parameter.png"),
			WParameterLayout.class);
	
	public static final WidgetOption ELEMENTCASE = WidgetOptionFactory.createByWidgetClass(Inter
			.getLocText("FR-Designer_Form-Report"), BaseUtils.readIcon("/com/fr/web/images/form/resources/report_16.png"),
			ElementCaseEditor.class);
}