Merge branch 'master' of http://www.finedevelop.com:2015/scm/~eason/design

designer_base/src/com/fr/design/gui/style/AlignmentPane.java

@@ -136,9 +136,7 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO
         ArrayList<String> selectOption = new ArrayList<String>();
         selectOption.add(Inter.getLocText("FR-Designer_Custom-Angle"));
         VerticalTextProcessor processor = ExtraClassManager.getInstance().getSingle(VerticalTextProcessor.XML_TAG, DefaultVerticalTextProcessor.class);
-        if (processor != null){
+		selectOption.addAll(Arrays.asList(processor.getComboxOption()));
-            selectOption.addAll(Arrays.asList(processor.getComboxOption()));
-        }
 
         textRotationComboBox = new UIComboBox(selectOption.toArray(new String[selectOption.size()]));
     }
@@ -242,7 +240,7 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO
 		} else {
 			this.textComboBox.setSelectedIndex(0);
 		}
-		if (style.getVerticalText() == Style.VERTICALTEXT && ExtraClassManager.getInstance().getSingle(VerticalTextProcessor.XML_TAG) != null) {
+		if (style.getVerticalText() == Style.VERTICALTEXT) {
 			textRotationComboBox.setSelectedIndex(style.getTextDirection() == Style.LEFT_TO_RIGHT ? 1 : 2);
 		} else {
 			textRotationComboBox.setSelectedIndex(0);

designer_base/src/com/fr/design/style/AlignmentPane.java

@@ -16,8 +16,6 @@ import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.Inter;
-import com.fr.plugin.ExtraClassManager;
-import com.fr.report.fun.VerticalTextProcessor;
 import com.fr.stable.CoreConstants;
 
 import javax.swing.*;
@@ -126,9 +124,6 @@ public class AlignmentPane extends BasicPane {
         directionBG.add(rightToLeftRB);
         rightToLeftRB.setSelected(true);
 
-        if (ExtraClassManager.getInstance().getSingle(VerticalTextProcessor.XML_TAG) == null){
-            return;
-        }
         isVerticalTextPanel.add(isVerticalTextCheckBox);
         isVerticalTextPanel.add(leftToRightRB);
         isVerticalTextPanel.add(rightToLeftRB);
@@ -302,9 +297,6 @@ public class AlignmentPane extends BasicPane {
     }
 
     private void populateVertical(Style style){
-        if (ExtraClassManager.getInstance().getSingle(VerticalTextProcessor.XML_TAG) == null){
-            return;
-        }
         this.isVerticalTextCheckBox.setSelected(true);
         this.rotationSpinner.setEnabled(false);
         if (style.getTextDirection() == Style.LEFT_TO_RIGHT) {

sonar-project.properties

@@ -0,0 +1,15 @@
+# must be unique in a given SonarQube instance
+sonar.projectKey=finereport.design
+# this is the name displayed in the SonarQube UI
+sonar.projectName=finereport.design
+sonar.projectVersion=1.0
+sonar.branch=master
+ 
+# Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows.
+# Since SonarQube 4.2, this property is optional if sonar.modules is set. 
+# If not set, SonarQube starts looking for source code from the directory containing 
+# the sonar-project.properties file.
+sonar.sources=.
+ 
+# Encoding of the source code. Default is default system encoding
+#sonar.sourceEncoding=UTF-8

start.bat

@@ -0,0 +1 @@
+sonar-scanner