Revision 2466 org.gvsig.vectorediting/trunk/org.gvsig.vectorediting/org.gvsig.vectorediting.swing/org.gvsig.vectorediting.swing.impl/src/main/java/org/gvsig/vectorediting/swing/impl/contextmenu/DefaultEditingContextMenu.java
DefaultEditingContextMenu.java | ||
---|---|---|
24 | 24 |
|
25 | 25 |
package org.gvsig.vectorediting.swing.impl.contextmenu; |
26 | 26 |
|
27 |
import com.oracle.jrockit.jfr.DataType; |
|
28 | 27 |
import java.awt.Component; |
29 | 28 |
import java.awt.event.ActionEvent; |
30 | 29 |
import java.util.List; |
31 | 30 |
import java.util.Map; |
32 |
import java.util.logging.Level;
|
|
31 |
import java.util.Objects;
|
|
33 | 32 |
import javax.swing.AbstractAction; |
34 | 33 |
import javax.swing.JComponent; |
35 | 34 |
import javax.swing.JMenu; |
36 | 35 |
import javax.swing.JOptionPane; |
37 |
import javax.swing.JPopupMenu; |
|
38 | 36 |
import javax.swing.JSeparator; |
39 | 37 |
import javax.swing.SwingConstants; |
40 | 38 |
import javax.swing.SwingUtilities; |
... | ... | |
59 | 57 |
import org.slf4j.LoggerFactory; |
60 | 58 |
|
61 | 59 |
/** |
62 |
* @author llmarques
|
|
60 |
* @author gvSIG Team
|
|
63 | 61 |
* |
64 | 62 |
*/ |
63 |
@SuppressWarnings("UseSpecificCatch") |
|
65 | 64 |
public class DefaultEditingContextMenu extends EditingContextMenuView implements |
66 | 65 |
EditingContextMenu { |
67 | 66 |
|
... | ... | |
124 | 123 |
} |
125 | 124 |
if(param.isOptional() && service.isEnabled(param)){ |
126 | 125 |
thereAreOptionalParameters = true; |
127 |
initAction(param, new AcceptValueListener() { |
|
128 |
|
|
129 |
@Override |
|
130 |
public void acceptValue(Object value) { |
|
131 |
try { |
|
132 |
context.setValue(param, (String)value); |
|
133 |
} catch (InvalidEntryException ex) { |
|
134 |
LOGGER.warn("Invalid value", ex); |
|
135 |
} |
|
126 |
initAction(param, (Object value) -> { |
|
127 |
try { |
|
128 |
context.setValue(param, (String)value); |
|
129 |
} catch (InvalidEntryException ex) { |
|
130 |
LOGGER.warn("Invalid value", ex); |
|
136 | 131 |
} |
137 | 132 |
}); |
138 | 133 |
} |
... | ... | |
180 | 175 |
builder.append(i18nManager.getTranslation((String)DataTypeUtils.coerce(DataTypes.STRING, value))); |
181 | 176 |
builder.append(")"); |
182 | 177 |
} catch (CoercionException ex) { |
183 |
LOGGER.warn("Can't coerce '" + ((value == null) ? "(null)" : value.toString()) + "' to String", ex);
|
|
178 |
LOGGER.warn("Can't coerce '" + Objects.toString(value) + "' to String", ex);
|
|
184 | 179 |
} |
185 | 180 |
} |
186 | 181 |
submenu = new JMenu(builder.toString()); |
... | ... | |
301 | 296 |
|
302 | 297 |
RunnableWithParameters runnable = new RunnableWithParameters() { |
303 | 298 |
|
299 |
@Override |
|
304 | 300 |
public void run() { |
305 | 301 |
this.returnValue = |
306 | 302 |
JOptionPane.showConfirmDialog(null, pointPanel, title, JOptionPane.OK_CANCEL_OPTION); |
Also available in: Unified diff