From 7afeb4840728c681b4ce355bd54ab0e5dba5f262 Mon Sep 17 00:00:00 2001 From: bancika Date: Wed, 12 Jan 2011 23:59:34 +0000 Subject: [PATCH] impoved bom --- .../Library/src/org/diylc/components/boards/PerfBoard.java | 5 +---- .../Library/src/org/diylc/components/misc/BOM.java | 4 +--- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/boards/PerfBoard.java b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/boards/PerfBoard.java index efb6065c..8e466c51 100644 --- a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/boards/PerfBoard.java +++ b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/boards/PerfBoard.java @@ -2,7 +2,6 @@ package org.diylc.components.boards; import java.awt.AlphaComposite; import java.awt.Color; -import java.awt.Composite; import java.awt.Graphics2D; import java.awt.Point; @@ -15,7 +14,7 @@ import org.diylc.core.measures.Size; import org.diylc.core.measures.SizeUnit; import org.diylc.utils.Constants; -@ComponentDescriptor(name = "Perf Board w/ Pads", category = "Boards", author = "Branislav Stojkovic", zOrder = IDIYComponent.BOARD, instanceNamePrefix = "Board", description = "Perforated FR4 board with solder pads spaced 0.1 inch apart") +@ComponentDescriptor(name = "Perf Board w/ Pads", category = "Boards", author = "Branislav Stojkovic", zOrder = IDIYComponent.BOARD, instanceNamePrefix = "Board", description = "Perforated board with solder pads") public class PerfBoard extends AbstractBoard { private static final long serialVersionUID = 1L; @@ -35,7 +34,6 @@ public class PerfBoard extends AbstractBoard { super.draw(g2d, componentState, project); if (componentState != ComponentState.DRAGGING) { - Composite oldComposite = g2d.getComposite(); if (alpha < MAX_ALPHA) { g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f * alpha / MAX_ALPHA)); @@ -57,7 +55,6 @@ public class PerfBoard extends AbstractBoard { holeDiameter); } } - g2d.setComposite(oldComposite); } } diff --git a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/misc/BOM.java b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/misc/BOM.java index 4cf54e17..bf2786a4 100644 --- a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/misc/BOM.java +++ b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/misc/BOM.java @@ -41,9 +41,7 @@ public class BOM extends AbstractComponent { Iterator iterator = bom.iterator(); while (iterator.hasNext()) { BomEntry entry = iterator.next(); - Object value = entry.getValue(); - if (value == null || value.toString().trim().isEmpty() - || entry.getName().toLowerCase().contains("bom")) { + if (entry.getValue() == null || entry.getName().toLowerCase().contains("bom")) { iterator.remove(); } }