/ - Diff - Application: gvSIG desktop - gvSIG

Revision 47703

     public class EvaluateExpressionPanel extends EvaluateExpressionPanelView {
         private static final Logger LOGGER = LoggerFactory.getLogger(EvaluateExpressionPanel.class);
         private ExpressionPickerController pickerExpression;
         private final ActionListenerSupport actionListener;
         public EvaluateExpressionPanel(ActionListenerSupport  actionListener, FeatureStore store) {
         public EvaluateExpressionPanel(ActionListenerSupport actionListener, FeatureStore store) {
             this.actionListener = actionListener;
             initComponents(store);
+        }
         private void initComponents(FeatureStore store) {
             ApplicationManager application = ApplicationLocator.getApplicationManager();
             ExpressionEvaluatorSwingManager expressionSwingManager = ExpressionEvaluatorSwingLocator.getManager();
             this.pickerExpression = expressionSwingManager.createExpressionPickerController(
                     this.txtExpression,
                     this.btnExpression,
                     this.btnExpressionHistory,
                     this.txtExpression,
                     this.btnExpression,
                     this.btnExpressionHistory,
                     this.btnExpressionBookmarks
             );
             if(store != null) {
             if (store != null) {
                 this.pickerExpression.getConfig().addElement(DALSwingLocator.getDataSwingManager().createFeatureStoreElement(store));
+            }
-...
             IWindow window = application.getActiveWindow();
             symbolTable.setVar("window", window);
             this.pickerExpression.getConfig().setPreviewSymbolTable(symbolTable);
             this.btnExecute.addActionListener((ActionEvent e) -> {
                 doExecuteExpression();
             });
             this.txtTitle.setText("Expresion");
+        }
         private void doExecuteExpression() {
             ApplicationManager application = ApplicationLocator.getApplicationManager();
             WindowManager windowManager = ToolsSwingLocator.getWindowManager();
             Expression exp = this.pickerExpression.get();
             if( exp == null ) {
                 return ; //???
             if (exp == null) {
                 return; //???
+            }
             MutableSymbolTable symbolTable = ExpressionUtils.createSymbolTable();
             IWindow window = application.getActiveWindow();
-...
             Object value;
             try {
                 value = exp.execute(symbolTable);
             } catch(Throwable th) {
                 LOGGER.warn("",th);
             } catch (Throwable th) {
                 LOGGER.warn("", th);
                 return; //???
+            }
             if( value == null ) {
             if (value == null) {
                 return;
+            }
             MyPanel panel = new MyPanel(this.actionListener, symbolTable, exp, (String) this.cboContentType.getSelectedItem());
             if( this.chkLaunchOnChangeBBox.isSelected() ) {
                 Document doc = application.getActiveDocument();
             if (this.chkLaunchOnChangeBBox.isSelected()) {
                 Document doc = application.getActiveDocument();
                 panel.setWindow(doc.getMainWindow());
+            }
             if( this.chkLaunchOnChangeSelection.isSelected() ) {
             if (this.chkLaunchOnChangeSelection.isSelected()) {
                 ViewDocument viewdoc = (ViewDocument) application.getActiveDocument(ViewManager.TYPENAME);
                 if( viewdoc!=null ) {
                 if (viewdoc != null) {
                     FLyrVect layer = viewdoc.getMapContext().getLayers().getFirstActiveVectorLayer();
                     panel.setLayer(layer);
+                }
-...
             panel.setValue(value);
             windowManager.showWindow(panel, this.txtTitle.getText(), this.getWindowMode());
+        }
         private WindowManager.MODE getWindowMode() {
             String s = (String) this.cboWindowType.getSelectedItem();
             switch(s.toLowerCase()) {
             switch (s.toLowerCase()) {
                 case "modal":
                 case "dialog":
                     return WindowManager.MODE.DIALOG;
-...
                     return WindowManager.MODE.WINDOW;
+            }
+        }
         private static class MyPanel extends JPanel {
             private final Expression expression;
-...
             private final ViewPortListener viewPortListener;
             private final MutableSymbolTable symbolTable;
             private final ActionListenerSupport actionListener;
     		private boolean isProcessing;
     		private Thread lastUpdate = null;
             private final Observer selectionListener;
             private boolean isProcessing;
             private Thread lastUpdate = null;
             private Observer selectionListener;
             public MyPanel(ActionListenerSupport actionListener, MutableSymbolTable symbolTable, Expression expression, String contentType) {
                 this.actionListener = actionListener;
                 this.setOpaque(false);
-...
                 this.expression = expression;
                 this.contentType = contentType;
                 this.isProcessing = false;
                 this.selectionListener = null;
                 this.actionListener.addActionListener((ActionEvent e) -> {
                     doUpdate();
                 });
-...
                 };
                 this.selectionListener = (Observable observable, Object notification) -> {
                     FeatureStoreNotification n = (FeatureStoreNotification) notification;
                     if( StringUtils.equalsIgnoreCase(n.getType(),DataStoreNotification.SELECTION_CHANGE) ) {
                     if (window == null ) {
                         try {
                             FeatureStore store = (FeatureStore) n.getSource();
                             store.deleteObserver(selectionListener);
                         } catch (Throwable t) {
                             LOGGER.warn("Can't remove observer from store", t);
+                        }
+                    }
                     if (StringUtils.equalsIgnoreCase(n.getType(), DataStoreNotification.SELECTION_CHANGE)) {
                         doUpdate();
+                    }
                 };
-...
                     @Override
                     public void componentHidden(ComponentEvent e) {
                         if( window instanceof IView) {
                             ViewPort viewPort = ((IView)window).getMapControl().getMapContext().getViewPort();
                         if (window instanceof IView) {
                             ViewPort viewPort = ((IView) window).getMapControl().getMapContext().getViewPort();
                             viewPort.removeViewPortListener(viewPortListener);
                             lastUpdate = null;
                             window = null;
+                        }
+                    }
                 });
+            }
             private synchronized void doUpdate() {
     			Thread th = new Thread(() -> {
     				isProcessing = true;
     				Object value = null;
     				try {
     					value = this.expression.execute(this.symbolTable);
     					this.setValue(value);
     				} catch (Throwable tt) {
     					LOGGER.warn("", tt);
+    				}
     				if(lastUpdate!=null) {
     					lastUpdate.start();
     					lastUpdate = null;
     				} else {
     					isProcessing = false;
+    				}
     			});
     			if (isProcessing==true) {
     				lastUpdate = th;
     				return;
+    			}
     			th.start();
                 if (window == null) {
                     return;
+                }
                 Thread th = new Thread(() -> {
                     isProcessing = true;
                     Object value = null;
                     try {
                         value = this.expression.execute(this.symbolTable);
                         this.setValue(value);
                     } catch (Throwable tt) {
                         LOGGER.warn("", tt);
+                    }
                     if (lastUpdate != null) {
                         lastUpdate.start();
                         lastUpdate = null;
                     } else {
                         isProcessing = false;
+                    }
                 }, "EvaluateExpressionPanel_update");
                 if (isProcessing == true) {
                     lastUpdate = th;
                     return;
+                }
                 th.start();
+            }
             public void setValue(Object value) {
     			if (!SwingUtilities.isEventDispatchThread()) {
     				Object v = value;
     				SwingUtilities.invokeLater(() -> {
     					setValue(v);
     				});
     				return;
+    			}
                 if( value == null ) {
                 if (!SwingUtilities.isEventDispatchThread()) {
                     Object v = value;
                     SwingUtilities.invokeLater(() -> {
                         setValue(v);
                     });
                     return;
+                }
                 if (value == null) {
                     this.removeAll();
                     this.revalidate();
                     return;
+                }
                 if( value instanceof SimpleImage ) {
                     value = ((SimpleImage)value).getBufferedImage();
                 if (value instanceof SimpleImage) {
                     value = ((SimpleImage) value).getBufferedImage();
+                }
                 if( value instanceof Image ) {
                 if (value instanceof Image) {
                     JLabel label = new JLabel();
                     label.setIcon(new ImageIcon((Image)value));
                     label.setIcon(new ImageIcon((Image) value));
                     value = label;
+                }
                 JComponent component;
                 if( value instanceof JComponent ) {
                 if (value instanceof JComponent) {
                     component = (JComponent) value;
                 } else {
                     JEditorPane browser = new JEditorPane();
-...
                 this.setLayout(new BorderLayout());
                 this.add(component);
                 this.revalidate();
+            }
             public void setWindow(IWindow window) {
                 this.window = window;
                 if( window instanceof IView) {
                     ViewPort viewPort = ((IView)this.window).getMapControl().getMapContext().getViewPort();
                 if (window instanceof IView) {
                     ViewPort viewPort = ((IView) this.window).getMapControl().getMapContext().getViewPort();
                     viewPort.addViewPortListener(this.viewPortListener);
+                }
+            }
             public void setLayer(FLyrVect layer) {
                 FeatureStore store = layer.getFeatureStore();
                 if( store != null ) {
                 if (store != null) {
                     store.deleteObserver(this.selectionListener);
                     store.addObserver(this.selectionListener);
+                }

Also available in: Unified diff