Browse Source

Merge pull request #1107 in DESIGN/design from ~KERRY/design_10.0:feature/10.0 to feature/10.0

* commit '7362c8186f39bc93804a95af50adf427db1210a5':
  REPORT-20327 sonar问题修复
persist/11.0
kerry 5 years ago
parent
commit
382238713d
  1. 15
      designer-base/src/main/java/com/fr/design/border/UIRoundedBorder.java
  2. 7
      designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MaxMemRowCountPanel.java
  3. 36
      designer-base/src/main/java/com/fr/design/dialog/JWizardPanel.java
  4. 2
      designer-base/src/main/java/com/fr/design/extra/QQLoginWebPane.java
  5. 2
      designer-base/src/main/java/com/fr/design/file/MutilTempalteTabPane.java

15
designer-base/src/main/java/com/fr/design/border/UIRoundedBorder.java

@ -13,23 +13,23 @@ import java.awt.geom.RoundRectangle2D;
public class UIRoundedBorder extends LineBorder {
private static final long serialVersionUID = 1L;
private int roundedCorner;
private int lineStyle;
public UIRoundedBorder(Color color) {
super(color);
}
public UIRoundedBorder(Color color, int thickness){
super(color, thickness);
}
public UIRoundedBorder(Color color, int thickness, int roundedCorners){
super(color, thickness, true);
this.roundedCorner = roundedCorners;
}
public UIRoundedBorder(int lineStyle, Color color, int roundedCorners){
super(color, GraphHelper.getLineStyleSize(lineStyle), true);
this.lineStyle = lineStyle;
@ -44,14 +44,15 @@ public class UIRoundedBorder extends LineBorder {
return lineStyle;
}
@Override
public void paintBorder(Component c, Graphics g, int x, int y, int width, int height){
Color oldColor = g.getColor();
Graphics2D g2d = (Graphics2D)g;
g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
g2d.setColor(lineColor);
GraphHelper.draw(g2d, new RoundRectangle2D.Double(x, y, width - 1, height-1, roundedCorner, roundedCorner),lineStyle);
GraphHelper.draw(g2d, new RoundRectangle2D.Double(x, y, width - 1.0D, height - 1.0D, roundedCorner, roundedCorner), lineStyle);
g2d.setColor(oldColor);
g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF);
}
}
}

7
designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MaxMemRowCountPanel.java

@ -40,7 +40,8 @@ public class MaxMemRowCountPanel extends UIToolbar {
}
}
};
@Override
public Dimension getPreferredSize() {
Dimension dim = super.getPreferredSize();
dim.width = 340;
@ -81,7 +82,7 @@ public class MaxMemRowCountPanel extends UIToolbar {
public void setValue(int value) {
if (value >= 0) {
showMaxPanel();
numberSpinner.setValue(Integer.valueOf(value));
numberSpinner.setValue(value);
} else {
showAllPanel();
}
@ -94,4 +95,4 @@ public class MaxMemRowCountPanel extends UIToolbar {
return ((Number) numberSpinner.getValue()).intValue();
}
}
}
}

36
designer-base/src/main/java/com/fr/design/dialog/JWizardPanel.java

@ -48,7 +48,7 @@ public class JWizardPanel extends BasicPane {
// Set the layout for the content area
contentPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
contentPane.setBorder(BorderFactory.createEmptyBorder(2, 2, 4, 4));
// Step title
@ -60,16 +60,16 @@ public class JWizardPanel extends BasicPane {
add(titlePanel, BorderLayout.NORTH);
add(contentPane, BorderLayout.CENTER);
}
@Override
protected String title4PopupWindow() {
return "wizard";
}
/**
* Set the title to use for this step. Normally this title would be unique
* for each wizards step.
*
*
* @param stepTitle The title to use for this step.
*/
public void setStepTitle(String stepTitle) {
@ -82,7 +82,7 @@ public class JWizardPanel extends BasicPane {
/**
* Get the step title to use for this step.
*
*
* @return The step title to use for this step.
*/
public String getStepTitle() {
@ -93,7 +93,7 @@ public class JWizardPanel extends BasicPane {
* Get a JPanel to use for adding your own components to this WizardPanel.
* Do not add components directly to the JWizardPanel. The JPanel uses the
* layout given in the JWizardPanel constructor.
*
*
* @return The JPanel to use for adding components for this wizard step.
*/
public JPanel getContentPane() {
@ -102,7 +102,7 @@ public class JWizardPanel extends BasicPane {
/**
* Get the wizard step to go to when the Back button is pressed.
*
*
* @return The wizard step to go to when the Back button is pressed.
*/
@ -114,7 +114,7 @@ public class JWizardPanel extends BasicPane {
* Set the wizard step to go to when the Back button is pressed. This should
* be set in the constructor of the JWizardPanel subclass since it
* determines whether the Back button is enabled or not.
*
*
* @param backStep
* The wizard step to go to when the Back button is pressed.
*/
@ -129,7 +129,7 @@ public class JWizardPanel extends BasicPane {
/**
* Get the wizard step to go to when the Next button is pressed.
*
*
* @return The wizard step to go to when the Next button is pressed.
*/
public int getNextStep() {
@ -140,7 +140,7 @@ public class JWizardPanel extends BasicPane {
* Set the wizard step to go to when the Next button is pressed. This should
* be set in the constructor of the JWizardPanel subclass since it
* determines whether the Next and Finish buttons are enabled or not.
*
*
* @param nextStep The wizard step to go to when the Next button is pressed.
*/
public void setNextStep(int nextStep) {
@ -154,7 +154,7 @@ public class JWizardPanel extends BasicPane {
/**
* Returns the JWizardDialog in which this JWizardPanel resides. This is
* valid only after the panel has been added to the dialog.
*
*
* @return The JWizardDialog in which this JWizardPanel resides.
*/
@ -168,7 +168,7 @@ public class JWizardPanel extends BasicPane {
public void addNotify() {
if (firstNotify) {
Font font = stepTitleLabel.getFont();
font = font.deriveFont(Font.BOLD, font.getSize() * 14 / 10);
font = font.deriveFont(Font.BOLD, font.getSize() * 14 / 10.0F);
stepTitleLabel.setFont(font);
firstNotify = false;
}
@ -177,7 +177,7 @@ public class JWizardPanel extends BasicPane {
/**
* Set the JWizardDialog parent for this JWizardPanel.
*
*
* @param dialogParent
* The JWizardPanel parent for this JWizardPanel.
*/
@ -188,7 +188,7 @@ public class JWizardPanel extends BasicPane {
/**
* Calls back(). This allows the JWizardDialog to call the protected method
* back().
*
*
* @see #back()
*/
@ -199,7 +199,7 @@ public class JWizardPanel extends BasicPane {
/**
* Calls next(). This allows the JWizardDialog to call the protected method
* next().
*
*
* @see #next()
*/
void doNext() {
@ -209,7 +209,7 @@ public class JWizardPanel extends BasicPane {
/**
* Called when the Back button is pressed. By default this displays the
* wizard step set by setBackStep().
*
*
* @see #setBackStep(int)
*/
protected void back() {
@ -219,11 +219,11 @@ public class JWizardPanel extends BasicPane {
/**
* Called when the Next button is pressed. By default this displays the
* wizard step set by setNextStep().
*
*
* @see #setNextStep(int)
*/
protected void next() {
dialogParent.goTo(getNextStep());
}
}
}

2
designer-base/src/main/java/com/fr/design/extra/QQLoginWebPane.java

@ -163,7 +163,7 @@ public class QQLoginWebPane extends JFXPanel {
final BooleanProperty confirmationResult = new SimpleBooleanProperty();
// initialize the confirmation dialog
final Stage dialog = new Stage(StageStyle.UTILITY);
dialog.setX(Toolkit.getDefaultToolkit().getScreenSize().getWidth() / 2 - DEFAULT_CONFIRM_WIDTH / 2 + DEFAULT_OFFEST);
dialog.setX(Toolkit.getDefaultToolkit().getScreenSize().getWidth() / 2 - DEFAULT_CONFIRM_WIDTH / 2.0D + DEFAULT_OFFEST);
dialog.setY(Toolkit.getDefaultToolkit().getScreenSize().getHeight() / 2 + DEFAULT_OFFEST);
dialog.setHeight(DEFAULT_CONFIRM_HEIGHT);
dialog.setWidth(DEFAULT_CONFIRM_WIDTH);

2
designer-base/src/main/java/com/fr/design/file/MutilTempalteTabPane.java

@ -322,7 +322,7 @@ public class MutilTempalteTabPane extends JComponent {
@Override
public void paintComponent(Graphics g) {
super.paintComponent(g);
double maxWidth = getWidth() - LIST_BUTTON_WIDTH; //最大宽度
double maxWidth = getWidth() - LIST_BUTTON_WIDTH * 1.0D; //最大宽度
Graphics2D g2d = (Graphics2D) g;
paintBackgroundAndLine(g2d, maxWidth);
}

Loading…
Cancel
Save