Revision: 6606 http://sourceforge.net/p/jump-pilot/code/6606 Author: ma15569 Date: 2020-10-26 15:51:13 +0000 (Mon, 26 Oct 2020) Log Message: ----------- BlockPanel, rationalized import to avoid error warning
Modified Paths: -------------- plug-ins/CADExtension/trunk/src/org/openjump/advancedtools/block/BlockPanel.java Modified: plug-ins/CADExtension/trunk/src/org/openjump/advancedtools/block/BlockPanel.java =================================================================== --- plug-ins/CADExtension/trunk/src/org/openjump/advancedtools/block/BlockPanel.java 2020-10-26 15:48:21 UTC (rev 6605) +++ plug-ins/CADExtension/trunk/src/org/openjump/advancedtools/block/BlockPanel.java 2020-10-26 15:51:13 UTC (rev 6606) @@ -1,17 +1,34 @@ package org.openjump.advancedtools.block; -import java.awt.*; +import static java.awt.GridBagConstraints.WEST; + +import java.awt.Color; +import java.awt.Component; +import java.awt.Dimension; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.Insets; import java.io.File; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; -import javax.swing.*; +import javax.swing.BorderFactory; +import javax.swing.DefaultListCellRenderer; +import javax.swing.Icon; +import javax.swing.JButton; +import javax.swing.JComboBox; +import javax.swing.JLabel; +import javax.swing.JList; +import javax.swing.JPanel; +import javax.swing.JSpinner; +import javax.swing.SpinnerModel; +import javax.swing.SpinnerNumberModel; import javax.swing.border.TitledBorder; -import com.vividsolutions.jts.geom.Geometry; - -import org.openjump.advancedtools.block.BlockCell; import org.openjump.advancedtools.language.I18NPlug; +import com.vividsolutions.jts.geom.Geometry; import com.vividsolutions.jump.I18N; import com.vividsolutions.jump.workbench.WorkbenchContext; import com.vividsolutions.jump.workbench.plugin.EnableCheck; @@ -19,8 +36,6 @@ import com.vividsolutions.jump.workbench.plugin.PlugInContext; import com.vividsolutions.jump.workbench.ui.WorkbenchToolBar; -import static java.awt.GridBagConstraints.WEST; - public class BlockPanel extends JPanel { private static final long serialVersionUID = 1L; @@ -207,31 +222,30 @@ } private List<BlockCell> getAllBlockCells(PlugInContext context) { - File pluginDir = context.getWorkbenchContext().getWorkbench() - .getPlugInManager().getPlugInDirectory(); - File folder = new File(pluginDir,blockFolder); - List<BlockCell> blocks = new ArrayList<>(); - blocks.add(BlockCell.SQUARE); - blocks.add(BlockCell.CIRCLE); - blocks.add(BlockCell.TRIANGLE); - blocks.add(BlockCell.CROSS); - blocks.add(BlockCell.STAR); - try { - File[] fList = folder.listFiles(); - //Set list of blocks in alphabetic order - Arrays.sort(fList); - if (fList != null) { - for (File file : fList) { - if (file.isFile() && file.getName().toUpperCase().endsWith(".WKT")) { - blocks.add(new BlockCell(file)); - } - } - } - } catch (Exception ex) { - ex.printStackTrace(); - } - return blocks; - } + File pluginDir = context.getWorkbenchContext().getWorkbench() + .getPlugInManager().getPlugInDirectory(); + File folder = new File(pluginDir,blockFolder); + List<BlockCell> blocks = new ArrayList<>(); + blocks.add(BlockCell.SQUARE); + blocks.add(BlockCell.CIRCLE); + blocks.add(BlockCell.TRIANGLE); + blocks.add(BlockCell.CROSS); + blocks.add(BlockCell.STAR); + try { + File[] fList = folder.listFiles(); + Arrays.sort(fList); + if (fList != null) { + for (File file : fList) { + if (file.isFile() && file.getName().toUpperCase().endsWith(".WKT")) { + blocks.add(new BlockCell(file)); + } + } + } + } catch (Exception ex) { + ex.printStackTrace(); + } + return blocks; + } private String gedDimensionTooltip() { _______________________________________________ Jump-pilot-devel mailing list Jump-pilot-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel