Skip to content

Commit

Permalink
重构界面
Browse files Browse the repository at this point in the history
  • Loading branch information
@HaojunRen
HaojunRen committed Jan 24, 2021
1 parent a472ee7 commit 13e3c77
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 31 deletions.
20 changes: 10 additions & 10 deletions desktop/src/main/java/com/nepxion/discovery/console/desktop/workspace/BlueGreenTopology.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,16 +147,16 @@ public void initializeView() {
StrategyHeaderEntity strategyHeaderEntity = ruleEntity.getStrategyCustomizationEntity().getStrategyHeaderEntity();

if (strategyConditionBlueEntity != null) {
String blueExpression = strategyConditionBlueEntity.getExpression();
if (blueExpression != null) {
conditionPanel.setBlueExpression(blueExpression);
String blueCondition = strategyConditionBlueEntity.getExpression();
if (blueCondition != null) {
conditionPanel.setBlueCondition(blueCondition);
}
}

if (strategyConditionGreenEntity != null) {
String greenExpression = strategyConditionGreenEntity.getExpression();
if (greenExpression != null) {
conditionPanel.setGreenExpression(greenExpression);
String greenCondition = strategyConditionGreenEntity.getExpression();
if (greenCondition != null) {
conditionPanel.setGreenCondition(greenCondition);
}
}

Expand Down Expand Up @@ -474,8 +474,8 @@ public boolean addServiceStrategy(String serviceId) {
String blueMetadata = ComboBoxUtil.getSelectedValue(blueMetadataComboBox);
String greenMetadata = ComboBoxUtil.getSelectedValue(greenMetadataComboBox);
String basicMetadata = ComboBoxUtil.getSelectedValue(basicMetadataComboBox);
String blueCondition = conditionPanel.getBlueExpression();
String greenCondition = conditionPanel.getGreenExpression();
String blueCondition = conditionPanel.getBlueCondition();
String greenCondition = conditionPanel.getGreenCondition();

if (StringUtils.isBlank(blueMetadata) || (blueGreenRouteType == BlueGreenRouteType.BLUE_GREEN_BASIC && StringUtils.isBlank(greenMetadata)) || StringUtils.isBlank(basicMetadata)) {
JBasicOptionPane.showMessageDialog(HandleManager.getFrame(BlueGreenTopology.this), TypeLocale.getName(strategyType) + " " + ConsoleLocaleFactory.getString("not_null"), SwingLocale.getString("warning"), JBasicOptionPane.WARNING_MESSAGE);
Expand Down Expand Up @@ -519,8 +519,8 @@ public boolean modifyServiceStrategy(String serviceId) {

@Override
public boolean modifyCondition() {
String blueCondition = conditionPanel.getBlueExpression();
String greenCondition = conditionPanel.getGreenExpression();
String blueCondition = conditionPanel.getBlueCondition();
String greenCondition = conditionPanel.getGreenCondition();

if (StringUtils.isBlank(blueCondition)) {
conditionPanel.showBlueConditionNotNullTip();
Expand Down
30 changes: 15 additions & 15 deletions ...n/java/com/nepxion/discovery/console/desktop/workspace/panel/BlueGreenConditionPanel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,20 +90,20 @@ public void setComponentEnabled(JComponent component, boolean enabled) {
}
}

public String getBlueExpression() {
public String getBlueCondition() {
return blueConditionBar.getCondition();
}

public void setBlueExpression(String blueExpression) {
blueConditionBar.setCondition(blueExpression);
public void setBlueCondition(String blueCondition) {
blueConditionBar.setCondition(blueCondition);
}

public String getGreenExpression() {
public String getGreenCondition() {
return greenConditionBar.getCondition();
}

public void setGreenExpression(String greenExpression) {
greenConditionBar.setCondition(greenExpression);
public void setGreenCondition(String greenCondition) {
greenConditionBar.setCondition(greenCondition);
}

public void showBlueConditionNotNullTip() {
Expand Down Expand Up @@ -133,7 +133,7 @@ public class ConditionBar extends JPanel {
protected List<ConditionItem> conditionItems = new ArrayList<ConditionItem>();

protected JPanel conditionItemBar;
protected JBasicTextField expressionTextField;
protected JBasicTextField conditionTextField;
protected JClassicButton aggregateButton;
protected JBasicTextField validateTextField;
protected JClassicButton validateButton;
Expand All @@ -145,7 +145,7 @@ public ConditionBar(ElementType nodeType) {
shrinkShortcut.setToolTipText(TypeLocale.getDescription(nodeType));

conditionItemBar = new JPanel();
expressionTextField = new JBasicTextField();
conditionTextField = new JBasicTextField();
validateTextField = new JBasicTextField();

aggregateButton = new JClassicButton(createAggregateConditionAction());
Expand All @@ -163,7 +163,7 @@ public ConditionBar(ElementType nodeType) {
JPanel conditionBar = new JPanel();
conditionBar.setLayout(tableLayout);
conditionBar.add(DimensionUtil.addWidth(new JBasicLabel(ConsoleLocaleFactory.getString("aggregate_text")), 5), "0, 0");
conditionBar.add(expressionTextField, "1, 0");
conditionBar.add(conditionTextField, "1, 0");
conditionBar.add(DimensionUtil.setWidth(aggregateButton, 30), "2, 0");
conditionBar.add(DimensionUtil.addWidth(new JBasicLabel(ConsoleLocaleFactory.getString("validate_text")), 5), "0, 1");
conditionBar.add(TextFieldUtil.setTip(validateTextField, ConsoleLocaleFactory.getString("validate_condition_example")), "1, 1");
Expand Down Expand Up @@ -233,19 +233,19 @@ public ConditionItem getConditionItem(String uuid) {
}

public String getCondition() {
return expressionTextField.getText().trim();
return conditionTextField.getText().trim();
}

public void setCondition(String condition) {
expressionTextField.setText(condition);
conditionTextField.setText(condition);
}

public void showConditionNotNullTip() {
expressionTextField.showTip(ConsoleLocaleFactory.getString("condition_not_null"), ConsoleIconFactory.getSwingIcon("error_message.png"), 1, 12);
conditionTextField.showTip(ConsoleLocaleFactory.getString("condition_not_null"), ConsoleIconFactory.getSwingIcon("error_message.png"), 1, 12);
}

public void showConditionInvalidFormatTip() {
expressionTextField.showTip(ConsoleLocaleFactory.getString("condition_invalid_format"), ConsoleIconFactory.getSwingIcon("error_message.png"), 1, 16);
conditionTextField.showTip(ConsoleLocaleFactory.getString("condition_invalid_format"), ConsoleIconFactory.getSwingIcon("error_message.png"), 1, 16);
}

public void showValidationInvalidFormatTip() {
Expand Down Expand Up @@ -399,7 +399,7 @@ public void execute(ActionEvent e) {
index++;
}

expressionTextField.setText(stringBuilder.toString());
conditionTextField.setText(stringBuilder.toString());
}
};

Expand All @@ -411,7 +411,7 @@ public JSecurityAction createValidateConditionAction() {
private static final long serialVersionUID = 1L;

public void execute(ActionEvent e) {
String condition = expressionTextField.getText().trim();
String condition = conditionTextField.getText().trim();
String validation = validateTextField.getText().trim();

if (StringUtils.isBlank(condition)) {
Expand Down
12 changes: 6 additions & 6 deletions ...overy/console/desktop/workspace/processor/strategy/BlueGreenStrategyReleaseProcessor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,15 +80,15 @@ public void fromConfig(RuleEntity ruleEntity, TDataBox dataBox) throws Exception
throw new DiscoveryException(ConsoleLocaleFactory.getString("green_condition_missing"));
}

String blueExpression = strategyConditionBlueEntity.getExpression();
if (StringUtils.isBlank(blueExpression)) {
String blueCondition = strategyConditionBlueEntity.getExpression();
if (StringUtils.isBlank(blueCondition)) {
throw new DiscoveryException(ConsoleLocaleFactory.getString("blue_condition_expression_missing"));
}

String greenExpression = null;
String greenCondition = null;
if (strategyConditionGreenEntity != null) {
greenExpression = strategyConditionGreenEntity.getExpression();
if (blueGreenRouteType == BlueGreenRouteType.BLUE_GREEN_BASIC && StringUtils.isBlank(greenExpression)) {
greenCondition = strategyConditionGreenEntity.getExpression();
if (blueGreenRouteType == BlueGreenRouteType.BLUE_GREEN_BASIC && StringUtils.isBlank(greenCondition)) {
throw new DiscoveryException(ConsoleLocaleFactory.getString("green_condition_expression_missing"));
}
}
Expand Down Expand Up @@ -153,7 +153,7 @@ public void fromConfig(RuleEntity ruleEntity, TDataBox dataBox) throws Exception
throw new DiscoveryException(ConsoleLocaleFactory.getString("service") + "【" + serviceId + "】" + TypeLocale.getDescription(ElementType.GREEN) + "【" + TypeLocale.getName(strategyType) + "】" + ConsoleLocaleFactory.getString("missing"));
}

blueGreenTopology.addNodes(serviceId, blueMetadata, greenMetadata, basicMetadata, blueExpression, greenExpression);
blueGreenTopology.addNodes(serviceId, blueMetadata, greenMetadata, basicMetadata, blueCondition, greenCondition);
}
}

Expand Down

0 comments on commit 13e3c77

Please sign in to comment.