Revision 3450

View differences:

org.gvsig.legend.vectorfilterexpression.app.mainplugin/trunk/org.gvsig.legend.vectorfilterexpression.app.mainplugin/src/main/java/org/gvsig/symbology/fmap/rendering/VectorFilterExpressionLegend.java
40 40
import org.gvsig.fmap.mapcontext.MapContextManager;
41 41
import org.gvsig.fmap.mapcontext.rendering.legend.events.SymbolLegendEvent;
42 42
import org.gvsig.fmap.mapcontext.rendering.symbols.ISymbol;
43
import org.gvsig.fmap.mapcontext.rendering.symbols.SymbolManager;
43 44
import org.gvsig.i18n.Messages;
45
import org.gvsig.symbology.fmap.mapcontext.rendering.legend.driver.impl.PersistenceBasedLegendWriter;
44 46
import org.gvsig.symbology.fmap.mapcontext.rendering.legend.impl.AbstractClassifiedVectorLegend;
45 47
import org.gvsig.tools.ToolsLocator;
46 48
import org.gvsig.tools.dynobject.DynStruct;
......
50 52
import org.gvsig.tools.persistence.PersistentState;
51 53
import org.gvsig.tools.persistence.exception.PersistenceException;
52 54
import org.gvsig.tools.util.Callable;
55
import org.gvsig.tools.util.Caller;
56
import org.gvsig.tools.util.impl.DefaultCaller;
53 57

  
54 58

  
55 59
/**
......
525 529
    }
526 530

  
527 531

  
532
  public static void selfRegister() {
533
    Caller caller = new DefaultCaller();
528 534

  
535
    caller.add(new VectorFilterExpressionLegend.RegisterLegend());
536
    caller.add(new VectorFilterExpressionLegend.RegisterPersistence());
537

  
538
    if (!caller.call()) {
539
      throw new RuntimeException(
540
              "Can't register VectorFilterExpressionLegend",
541
              caller.getException()
542
      );
543
    }
544
    MapContextManager mcoman = MapContextLocator.getMapContextManager();
545
    mcoman.registerLegendWriter(
546
        VectorFilterExpressionLegend.class,
547
            SymbolManager.LEGEND_FILE_EXTENSION.substring(1),
548
            PersistenceBasedLegendWriter.class);
549
    
550
    
551
  }
552

  
529 553
}
org.gvsig.legend.vectorfilterexpression.app.mainplugin/trunk/org.gvsig.legend.vectorfilterexpression.app.mainplugin/src/main/java/org/gvsig/symbology/gui/layerproperties/VectorFilterExpressionPanel.java
65 65
import org.gvsig.symbology.fmap.mapcontext.rendering.symbol.fill.impl.PictureFillSymbol;
66 66
import org.gvsig.symbology.fmap.mapcontext.rendering.symbol.style.IMarkerFillPropertiesStyle;
67 67
import org.gvsig.symbology.fmap.rendering.VectorFilterExpressionLegend;
68
import org.gvsig.symbology.swing.SymbologySwingLocator;
68 69
import org.gvsig.tools.ToolsLocator;
69 70
import org.gvsig.tools.i18n.I18nManager;
70 71
import org.gvsig.tools.swing.api.ToolsSwingLocator;
......
643 644
        return false;
644 645
    }
645 646

  
647
    public static void selfRegister() {
648
        IconThemeHelper.registerIcon("legend","legend-overview-vector-filter-expression", VectorFilterExpressionPanel.class);
649
        IconThemeHelper.registerIcon("legend","legend-overview-vectorial-unique-value", VectorFilterExpressionPanel.class);
650
        IconThemeHelper.registerIcon("symbol","symbol-layer-move-down", VectorFilterExpressionPanel.class);
651
        IconThemeHelper.registerIcon("symbol","symbol-layer-move-up", VectorFilterExpressionPanel.class);
652
        
653
        
654
        SymbologySwingLocator.getSwingManager().registerLegendEditor(VectorFilterExpressionPanel.class);
655

  
656
//        SymbologySwingLocator.getSwingManager().registerLegendEditor(VectorFilterExpressionPanel2.class);
657

  
658
        
659
        
660
        SymbolTable.addNewCellEditor("expressions",
661
            new ExpressionFieldCellEditor(null));
662
      
663
    }
646 664
}
org.gvsig.legend.vectorfilterexpression.app.mainplugin/trunk/org.gvsig.legend.vectorfilterexpression.app.mainplugin/src/main/java/org/gvsig/symbology/library/VectorFilterExpressionLibrary.java
23 23
 */
24 24
package org.gvsig.symbology.library;
25 25

  
26
import org.gvsig.andami.IconThemeHelper;
27
import org.gvsig.app.project.documents.view.legend.gui.SymbolTable;
28
import org.gvsig.fmap.mapcontext.MapContextLocator;
29
import org.gvsig.fmap.mapcontext.MapContextManager;
30
import org.gvsig.fmap.mapcontext.rendering.symbols.SymbolManager;
31 26
import org.gvsig.symbology.SymbologyLibrary;
32
import org.gvsig.symbology.fmap.mapcontext.rendering.legend.driver.impl.PersistenceBasedLegendWriter;
33 27
import org.gvsig.symbology.fmap.rendering.VectorFilterExpressionLegend;
34
import org.gvsig.symbology.gui.layerproperties.ExpressionFieldCellEditor;
35 28
import org.gvsig.symbology.gui.layerproperties.VectorFilterExpressionPanel;
36
import org.gvsig.symbology.swing.SymbologySwingLocator;
37 29
import org.gvsig.tools.library.AbstractLibrary;
38 30
import org.gvsig.tools.library.LibraryException;
39 31
import org.gvsig.tools.persistence.xml.XMLPersistenceLibrary;
40
import org.gvsig.tools.util.Caller;
41
import org.gvsig.tools.util.impl.DefaultCaller;
42 32

  
43 33

  
44 34
/**
......
50 40
public class VectorFilterExpressionLibrary extends AbstractLibrary {
51 41

  
52 42

  
43
    @Override
53 44
    public void doRegistration() {
54 45
        registerAsImplementationOf(VectorFilterExpressionLibrary.class);
55 46
        /*
......
62 53
        require(XMLPersistenceLibrary.class);
63 54
    }
64 55

  
56
    @Override
65 57
    protected void doInitialize() throws LibraryException {
66 58

  
67 59
    }
68 60

  
69 61

  
62
    @Override
70 63
    protected void doPostInitialize() throws LibraryException {
71 64

  
72
        IconThemeHelper.registerIcon("legend",
73
            "legend-overview-vector-filter-expression", this);
74
        IconThemeHelper.registerIcon("legend",
75
            "legend-overview-vectorial-unique-value", this);
76
        IconThemeHelper.registerIcon("symbol",
77
            "symbol-layer-move-down", this);
78
        IconThemeHelper.registerIcon("symbol",
79
            "symbol-layer-move-up", this);
80

  
81
        Caller caller = new DefaultCaller();
82

  
83
        caller.add(new VectorFilterExpressionLegend.RegisterLegend());
84
        caller.add(new VectorFilterExpressionLegend.RegisterPersistence());
85

  
86
        /*
87
         * Do register of all
88
         */
89
        if( !caller.call() ) {
90
            throw new LibraryException(
91
                VectorFilterExpressionLibrary.class,
92
                caller.getExceptions());
93
        }
65
      VectorFilterExpressionLegend.selfRegister();
66
      VectorFilterExpressionPanel.selfRegister();
94 67
        
95
        MapContextManager mcoman = MapContextLocator.getMapContextManager();
96
        mcoman.registerLegendWriter(
97
        		VectorFilterExpressionLegend.class,
98
                SymbolManager.LEGEND_FILE_EXTENSION.substring(1),
99
                PersistenceBasedLegendWriter.class);
100
        
101
        SymbologySwingLocator.getSwingManager().registerLegendEditor(VectorFilterExpressionPanel.class);
102
//        SymbologySwingLocator.getSwingManager().registerLegendEditor(VectorFilterExpressionPanel2.class);
103

  
104
        
105
        
106
        SymbolTable.addNewCellEditor("expressions",
107
            new ExpressionFieldCellEditor(null));
108

  
109 68
    }
110 69

  
111 70

  

Also available in: Unified diff