Author: tchemit Date: 2013-05-22 11:19:40 +0200 (Wed, 22 May 2013) New Revision: 981 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/981 Log: optimize dependencies + fix java 1.7 code Modified: trunk/tutti-service/pom.xml trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2013-05-22 09:11:54 UTC (rev 980) +++ trunk/tutti-service/pom.xml 2013-05-22 09:19:40 UTC (rev 981) @@ -125,11 +125,6 @@ <artifactId>xwork-core</artifactId> </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-tx</artifactId> - </dependency> - <!-- Logging --> <dependency> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java 2013-05-22 09:11:54 UTC (rev 980) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java 2013-05-22 09:19:40 UTC (rev 981) @@ -39,13 +39,14 @@ import fr.ifremer.tutti.ui.swing.util.CloseableUI; import fr.ifremer.tutti.ui.swing.util.TuttiUI; import jaxx.runtime.validator.swing.SwingValidator; -import org.apache.commons.collections.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.jdesktop.swingx.JXTable; -import javax.swing.*; -import java.awt.*; +import javax.swing.JComponent; +import javax.swing.JList; +import javax.swing.SwingUtilities; +import java.awt.Point; +import java.awt.Rectangle; import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; import java.awt.event.MouseAdapter; @@ -242,7 +243,7 @@ boolean viewMenuEnabled = false; if (gear != null) { editMenuEnabled = !getModel().isCreate() && !getModel().isModify() - && (!gear.isScientificGear() || persistenceService.isTemporary(gear)); + && (!gear.isScientificGear() || persistenceService.isTemporary(gear)); viewMenuEnabled = true; ui.setContextValue(gear); } @@ -271,14 +272,14 @@ // get the point in the middle lower of the cell Point p = new Point(r.x + r.width / 2, r.y + r.height); - List<Gear> gears = source.getSelectedValuesList(); + Gear[] gears = (Gear[]) source.getSelectedValues(); boolean editMenuEnabled = false; boolean viewMenuEnabled = false; - if (gears != null && gears.size() == 1) { - Gear gear = gears.get(0); + if (gears != null && gears.length == 1) { + Gear gear = gears[0]; editMenuEnabled = !getModel().isCreate() && !getModel().isModify() - && (!gear.isScientificGear() || persistenceService.isTemporary(gear)); + && (!gear.isScientificGear() || persistenceService.isTemporary(gear)); viewMenuEnabled = true; ui.setContextValue(gear); }