[analysis]DataSign.occurRequired重命名为required，DataSign.occurMultiple重命名为multiple

datagear-analysis/src/main/java/org/datagear/analysis/DataSign.java

@@ -28,8 +28,8 @@ public class DataSign implements Serializable
 	private static final long serialVersionUID = 1L;
 
 	public static final String PROPERTY_NAME = "name";
-	public static final String PROPERTY_OCCUR_REQUIRED = "occurRequired";
-	public static final String PROPERTY_OCCUR_MULTIPLE = "occurMultiple";
+	public static final String PROPERTY_REQUIRED = "required";
+	public static final String PROPERTY_MULTIPLE = "multiple";
 	public static final String PROPERTY_NAME_LABEL = "nameLabel";
 	public static final String PROPERTY_DESC_LABEL = "descLabel";
 
@@ -37,10 +37,10 @@ public class DataSign implements Serializable
 	private String name;
 
 	/** 数据集是否必须有此标记 */
-	private boolean occurRequired;
+	private boolean required;
 
 	/** 数据集是否可有多个此标记 */
-	private boolean occurMultiple;
+	private boolean multiple;
 
 	/** 名称标签 */
 	private Label nameLabel;
@@ -53,12 +53,12 @@ public class DataSign implements Serializable
 		super();
 	}
 
-	public DataSign(String name, boolean occurRequired, boolean occurMultiple)
+	public DataSign(String name, boolean required, boolean multiple)
 	{
 		super();
 		this.name = name;
-		this.occurRequired = occurRequired;
-		this.occurMultiple = occurMultiple;
+		this.required = required;
+		this.multiple = multiple;
 	}
 
 	public String getName()
@@ -71,24 +71,24 @@ public class DataSign implements Serializable
 		this.name = name;
 	}
 
-	public boolean isOccurRequired()
+	public boolean isRequired()
 	{
-		return occurRequired;
+		return required;
 	}
 
-	public void setOccurRequired(boolean occurRequired)
+	public void setRequired(boolean required)
 	{
-		this.occurRequired = occurRequired;
+		this.required = required;
 	}
 
-	public boolean isOccurMultiple()
+	public boolean isMultiple()
 	{
-		return occurMultiple;
+		return multiple;
 	}
 
-	public void setOccurMultiple(boolean occurMultiple)
+	public void setMultiple(boolean multiple)
 	{
-		this.occurMultiple = occurMultiple;
+		this.multiple = multiple;
 	}
 
 	public boolean hasNameLabel()
@@ -124,8 +124,8 @@ public class DataSign implements Serializable
 	@Override
 	public String toString()
 	{
-		return getClass().getSimpleName() + " [name=" + name + ", occurRequired=" + occurRequired + ", occurMultiple="
-				+ occurMultiple + ", nameLabel=" + nameLabel + ", descLabel=" + descLabel + "]";
+		return getClass().getSimpleName() + " [name=" + name + ", required=" + required + ", multiple="
+				+ multiple + ", nameLabel=" + nameLabel + ", descLabel=" + descLabel + "]";
 	}
 
 	public static List<DataSign> toDataSigns(List<String> labelValues, Locale locale)

datagear-analysis/src/main/java/org/datagear/analysis/support/JsonChartPluginPropertiesResolver.java

@@ -632,8 +632,8 @@ public class JsonChartPluginPropertiesResolver
 			DataSign dataSign = createDataSign();
 			dataSign.setName(name);
 
-			dataSign.setOccurRequired(convertToBoolean(map.get(DataSign.PROPERTY_OCCUR_REQUIRED), true));
-			dataSign.setOccurMultiple(convertToBoolean(map.get(DataSign.PROPERTY_OCCUR_MULTIPLE), true));
+			dataSign.setRequired(convertToBoolean(map.get(DataSign.PROPERTY_REQUIRED), true));
+			dataSign.setMultiple(convertToBoolean(map.get(DataSign.PROPERTY_MULTIPLE), true));
 			dataSign.setNameLabel(convertToLabel(map.get(DataSign.PROPERTY_NAME_LABEL)));
 			dataSign.setDescLabel(convertToLabel(map.get(DataSign.PROPERTY_DESC_LABEL)));
 

datagear-analysis/src/test/java/org/datagear/analysis/support/JsonChartPluginPropertiesResolverTest.java

@@ -141,8 +141,8 @@ public class JsonChartPluginPropertiesResolverTest
 				DataSign dataSign = dataSigns.get(0);
 
 				Assert.assertEquals("x-value", dataSign.getName());
-				Assert.assertFalse(dataSign.isOccurRequired());
-				Assert.assertFalse(dataSign.isOccurMultiple());
+				Assert.assertFalse(dataSign.isRequired());
+				Assert.assertFalse(dataSign.isMultiple());
 
 				Label nameLabel = dataSign.getNameLabel();
 				Assert.assertEquals("X值", nameLabel.getValue());
@@ -159,8 +159,8 @@ public class JsonChartPluginPropertiesResolverTest
 				DataSign dataSign = dataSigns.get(1);
 
 				Assert.assertEquals("y-value", dataSign.getName());
-				Assert.assertTrue(dataSign.isOccurRequired());
-				Assert.assertTrue(dataSign.isOccurMultiple());
+				Assert.assertTrue(dataSign.isRequired());
+				Assert.assertTrue(dataSign.isMultiple());
 
 				Label nameLabel = dataSign.getNameLabel();
 				Assert.assertEquals("Y值", nameLabel.getValue());

datagear-analysis/src/test/resources/org/datagear/analysis/support/JsonChartPluginPropertiesResolverTest.json

@@ -97,8 +97,8 @@
 	[
   		{
 			name : 'x-value',
-			occurRequired : false,
-			occurMultiple : false,
+			required : false,
+			multiple : false,
 			nameLabel :
 			{
 				value : 'X值',
@@ -120,8 +120,8 @@
 		},
 		{
 			name : 'y-value',
-			occurRequired : true,
-			occurMultiple : true,
+			required : true,
+			multiple : true,
 			nameLabel :
 			{
 				value : 'Y值',

datagear-web/src/main/java/org/datagear/web/controller/AbstractChartPluginAwareController.java

@@ -131,8 +131,8 @@ public class AbstractChartPluginAwareController extends AbstractDataAnalysisCont
 			List<DataSign> dataSignVOs = new ArrayList<DataSign>(dataSigns.size());
 			for (DataSign dataSign : dataSigns)
 			{
-				DataSign view = new DataSign(dataSign.getName(), dataSign.isOccurRequired(),
-						dataSign.isOccurMultiple());
+				DataSign view = new DataSign(dataSign.getName(), dataSign.isRequired(),
+						dataSign.isMultiple());
 				view.setNameLabel(toConcreteLabel(dataSign.getNameLabel(), locale));
 				view.setDescLabel(toConcreteLabel(dataSign.getDescLabel(), locale));
 

datagear-web/src/main/resources/org/datagear/web/webapp/view/freemarker/analysis/chart/chart_form.ftl

@@ -434,7 +434,7 @@ readonly 是否只读操作，允许为null
 			
 			var $button = $("<button type='button' class='data-sign-item ui-button ui-corner-all' />")
 				.attr("value", dataSign.name)
-				.attr("occurMultiple", dataSign.occurMultiple)
+				.attr("dataSignMultiple", dataSign.multiple)
 				.text(po.dataSignLabel(dataSign)).appendTo($panelContent);
 			
 			po.updatePropertySignButtonEnable($button, $itemSigns);
@@ -462,7 +462,7 @@ readonly 是否只读操作，允许为null
 	
 	po.updatePropertySignButtonEnable = function($button, $itemSigns)
 	{
-		if($button.attr("occurMultiple") != "false")
+		if($button.attr("dataSignMultiple") != "false")
 			return;
 		
 		var setSigns = [];
@@ -504,7 +504,7 @@ readonly 是否只读操作，允许为null
 		var requiredSigns = [];
 		for(var i=0; i<dataSigns.length; i++)
 		{
-			if(dataSigns[i].occurRequired == true)
+			if(dataSigns[i].required == true)
 				requiredSigns.push(dataSigns[i]);
 		}