冲突

designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPoplinkPane.java

@@ -4,7 +4,6 @@ import com.fr.base.chart.BaseChartCollection;
 import com.fr.chart.chartattr.Bar2DPlot;
 import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.ChartCollection;
-import com.fr.chart.chartattr.ChartFactory;
 import com.fr.chart.charttypes.ChartTypeManager;
 import com.fr.chart.web.ChartHyperPoplink;
 import com.fr.design.beans.BasicBeanPane;
@@ -43,8 +42,7 @@ public class ChartHyperPoplinkPane extends BasicBeanPane<ChartHyperPoplink> {
 
 		hyperEditPane = new ChartHyperEditPane(getChartParaType(), getValueEditorPane(), getValueEditorPane());
 		this.add(hyperEditPane, BorderLayout.CENTER);
-
+        ChartCollection cc = createChartCollection();
-		ChartCollection cc =  createChartCollection();
 		
 		chartComponent = new ChartComponent();
 		chartComponent.setPreferredSize(new Dimension(220, 170));// 在单元格弹出时 需要调整保证属性表的大小.
@@ -75,7 +73,7 @@ public class ChartHyperPoplinkPane extends BasicBeanPane<ChartHyperPoplink> {
         return cc;
     }
 
-	protected int getChartParaType() {
+    protected int getChartParaType() {
 		return ParameterTableModel.CHART_NORMAL_USE;
 	}
 

designer_chart/src/com/fr/design/mainframe/chart/gui/data/NormalChartDataPane.java

@@ -109,7 +109,6 @@ public class NormalChartDataPane extends DataContentsPane {
 		} else {
 			dataPane.populateBean(collection);
 		}
-
 		this.initAllListeners();
 		this.addAttributeChangeListener(listener);
 		

sonar-project.properties

@@ -3,7 +3,7 @@ sonar.projectKey=finereport.design
 # this is the name displayed in the SonarQube UI
 sonar.projectName=finereport.design
 sonar.projectVersion=1.0
-sonar.branch=dev
+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.