From a74f00a5fd4c9d9095e6b7aa6f89784835b9395b Mon Sep 17 00:00:00 2001 From: Branislav Stojkovic Date: Sun, 30 Oct 2016 12:30:30 +0100 Subject: [PATCH] simplify code --- .../diylc/swing/plugins/cloud/view/CommentDialog.java | 3 +-- .../cloud/view/browser/ResultsScrollPanel.java | 11 ++++------- .../cloud/view/browser/SimpleCloudGlassPane.java | 8 -------- 3 files changed, 5 insertions(+), 17 deletions(-) diff --git a/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/view/CommentDialog.java b/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/view/CommentDialog.java index e37c1e27..f158fe2d 100644 --- a/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/view/CommentDialog.java +++ b/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/view/CommentDialog.java @@ -68,8 +68,7 @@ public class CommentDialog extends JDialog { if (listPanel == null) { listPanel = new JPanel(new GridBagLayout()); listPanel.setBackground(Color.white); - for (int i = 0; i < comments.size(); i++) { - CommentEntity c = comments.get(i); + for (CommentEntity c : comments) { addComment(c); GridBagConstraints gbc = new GridBagConstraints(); diff --git a/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/view/browser/ResultsScrollPanel.java b/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/view/browser/ResultsScrollPanel.java index 2ad758cd..99f157af 100644 --- a/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/view/browser/ResultsScrollPanel.java +++ b/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/view/browser/ResultsScrollPanel.java @@ -81,8 +81,8 @@ public class ResultsScrollPanel extends JScrollPane { private Icon spinnerIcon = IconLoader.Spinning.getIcon(); - public ResultsScrollPanel(ISwingUI mainUI, ISimpleView cloudUI, IPlugInPort plugInPort, - PagingProvider provider, CloudPresenter cloudPresenter) { + public ResultsScrollPanel(ISwingUI mainUI, ISimpleView cloudUI, IPlugInPort plugInPort, PagingProvider provider, + CloudPresenter cloudPresenter) { super(); this.mainUI = mainUI; this.cloudUI = cloudUI; @@ -146,8 +146,8 @@ public class ResultsScrollPanel extends JScrollPane { } else { final Point old = getViewport().getViewPosition(); LOG.info("Adding " + projects.size() + " projects to display."); - for (int i = 0; i < projects.size(); i++) { - addProjectToDisplay(projects.get(i)); + for (ProjectEntity project : projects) { + addProjectToDisplay(project); this.currentLocation++; } armed = true; @@ -173,8 +173,6 @@ public class ResultsScrollPanel extends JScrollPane { JLabel nameLabel = new JLabel("" + project.getName() + ""); nameLabel.setFont(nameLabel.getFont().deriveFont(12f)); - // JLabel descriptionArea = new JLabel("

" + project.getDescription() + - // "

"); JTextArea descriptionArea = new JTextArea(project.getDescription().replace("
", "\n")); descriptionArea.setEditable(false); descriptionArea.setFont(thumbnailLabel.getFont()); @@ -185,7 +183,6 @@ public class ResultsScrollPanel extends JScrollPane { DefaultCaret caret = (DefaultCaret) descriptionArea.getCaret(); caret.setUpdatePolicy(DefaultCaret.NEVER_UPDATE); descriptionArea.setEnabled(false); - // descriptionArea.setDisabledTextColor(descriptionArea.getSelectionColor()); JLabel commentLabel = new JLabel(Integer.toString(project.getCommentCount()), IconLoader.Messages.getIcon(), SwingConstants.LEFT); diff --git a/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/view/browser/SimpleCloudGlassPane.java b/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/view/browser/SimpleCloudGlassPane.java index 7f618651..7ed0ce37 100644 --- a/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/view/browser/SimpleCloudGlassPane.java +++ b/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/view/browser/SimpleCloudGlassPane.java @@ -26,7 +26,6 @@ public class SimpleCloudGlassPane extends JPanel implements MouseListener, KeyLi private static final long serialVersionUID = -5344758920442881290L; - public SimpleCloudGlassPane() { addKeyListener(this); addMouseListener(this); @@ -46,13 +45,6 @@ public class SimpleCloudGlassPane extends JPanel implements MouseListener, KeyLi JLabel cloudLabel = new JLabel(IconLoader.CloudWait.getIcon()); cloudLabel.setHorizontalAlignment(SwingConstants.CENTER); add(cloudLabel, gbc); -// -// gbc.gridy = 1; -// gbc.weighty = 1.5; -// gbc.anchor = GridBagConstraints.FIRST_LINE_START; -// JLabel label = new JLabel("Querying the cloud..."); -// label.setHorizontalAlignment(SwingConstants.CENTER); -// add(label, gbc); } @Override