Merge branch 'fbp/release' of ssh://code.fineres.com:7999/~renekton/design into fbp/release

designer-base/src/main/java/com/fr/startup/ui/StartupPageWorkspacePanel.java

@@ -413,7 +413,7 @@ public class StartupPageWorkspacePanel extends JPanel {
         }
 
         selectWorkspacePanel.setPreferredSize(SELECT_WORKSPACE_DIMENSION);
-        workspaceItemDesc.add(selectWorkspacePanel, BorderLayout.WEST);
+        workspaceItemDesc.add(selectWorkspacePanel, BorderLayout.CENTER);
     }
 
     private void layoutSelectAndCreatePanel(StartupWorkspaceBean workspaceInfo, JPanel workspaceItemDesc) {

designer-base/src/main/resources/com/fr/env/jarVersion.properties

@@ -1 +1 @@
-report-engine-key=fine-report-engine-1.0.jar
+report-engine-key=fine-report-engine-1.0.0.jar

designer-realize/src/main/java/com/fr/design/webattr/WebCssPane.java

@@ -80,8 +80,8 @@ public class WebCssPane extends BasicPane {
 
 		@Override
 		public void actionPerformed(ActionEvent e) {
-			FILEChooserPane fileChooser = FILEChooserPane.getInstanceWithDesignatePath(ProjectConstants.RESOURCES_NAME,
-					new ChooseFileFilter("css", "css" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_File")), ProjectConstants.RESOURCES_NAME);
+			FILEChooserPane fileChooser = FILEChooserPane.getInstance(false, false, true,
+					new ChooseFileFilter("css", "css" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_File")));
 
 			if (fileChooser.showOpenDialog(DesignerContext.getDesignerFrame()) == FILEChooserPane.OK_OPTION) {
 				final FILE file = fileChooser.getSelectedFILE();

designer-realize/src/main/java/com/fr/design/webattr/WebJsPane.java

@@ -158,8 +158,8 @@ public class WebJsPane extends BasicPane {
 	private ActionListener chooseFileListener = new ActionListener() {
 		@Override
 		public void actionPerformed(ActionEvent e) {
-			FILEChooserPane fileChooser = FILEChooserPane.getInstanceWithDesignatePath(ProjectConstants.RESOURCES_NAME ,
-					new ChooseFileFilter("js", "javascript" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_File")), ProjectConstants.RESOURCES_NAME);
+			FILEChooserPane fileChooser = FILEChooserPane.getInstance(false, false, true,
+					new ChooseFileFilter("js", "javascript" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_File")));
 
 			if (fileChooser.showOpenDialog(DesignerContext.getDesignerFrame()) == FILEChooserPane.OK_OPTION) {
 				final FILE file = fileChooser.getSelectedFILE();