Revision 306 org.gvsig.vectorediting/trunk/org.gvsig.vectorediting/org.gvsig.vectorediting.main/src/main/java/org/gvsig/vectorediting/main/Main.java

View differences:

Main.java
81 81
import org.gvsig.vectorediting.lib.api.EditingLocator;
82 82
import org.gvsig.vectorediting.lib.api.EditingManager;
83 83
import org.gvsig.vectorediting.lib.prov.arc.ArcEditingProviderFactory;
84
import org.gvsig.vectorediting.lib.prov.autopolygon.AutopolygonEditingProviderFactory;
84 85
import org.gvsig.vectorediting.lib.prov.circle3p.Circle3PEditingProviderFactory;
85 86
import org.gvsig.vectorediting.lib.prov.circle3p.Circumference3PEditingProviderFactory;
86 87
import org.gvsig.vectorediting.lib.prov.circlecr.CircleCREditingProviderFactory;
......
89 90
import org.gvsig.vectorediting.lib.prov.ellipse.EllipseEditingProviderFactory;
90 91
import org.gvsig.vectorediting.lib.prov.explode.ExplodeEditingProviderFactory;
91 92
import org.gvsig.vectorediting.lib.prov.internalpolygon.InternalPolygonEditingProviderFactory;
93
import org.gvsig.vectorediting.lib.prov.join.JoinEditingProviderFactory;
92 94
import org.gvsig.vectorediting.lib.prov.line.LineEditingProviderFactory;
93 95
import org.gvsig.vectorediting.lib.prov.move.MoveEditingProviderFactory;
94 96
import org.gvsig.vectorediting.lib.prov.multipoint.MultipointEditingProviderFactory;
......
100 102
import org.gvsig.vectorediting.lib.prov.regularpolygon.FilledRegularPolygonEditingProviderFactory;
101 103
import org.gvsig.vectorediting.lib.prov.regularpolygon.RegularPolygonEditingProviderFactory;
102 104
import org.gvsig.vectorediting.lib.prov.rotate.RotateEditingProviderFactory;
105
import org.gvsig.vectorediting.lib.prov.scale.ScaleEditingProviderFactory;
103 106
import org.gvsig.vectorediting.lib.prov.simplify.SimplifyEditingProviderFactory;
104 107
import org.gvsig.vectorediting.lib.prov.spline.FilledSplineEditingProviderFactory;
105 108
import org.gvsig.vectorediting.lib.prov.spline.SplineEditingProviderFactory;
......
218 221
        buttons = new ArrayList<JButton>();
219 222

  
220 223
        buttons.add(new JButton(getPointAction()));
224
        buttons.add(new JButton(getMultiPointAction()));
221 225
        buttons.add(new JButton(getLineAction()));
222 226
        buttons.add(new JButton(getArcAction()));
223 227
        buttons.add(new JButton(getCircumferenceCrAction()));
......
233 237
        buttons.add(new JButton(getFilledRectangleAction()));
234 238
        buttons.add(new JButton(getSplineAction()));
235 239
        buttons.add(new JButton(getFilledSplineAction()));
240
        buttons.add(new JButton(getAutopolygonAction()));
236 241
        buttons.add(new JButton(getInternalPolygonAction()));
237 242
        buttons.add(new JButton(getExplodeGeometryAction()));
238 243
        buttons.add(new JButton(getMoveAction()));
......
240 245
        buttons.add(new JButton(getRotateAction()));
241 246
        buttons.add(new JButton(getSplitLineAction()));
242 247
        buttons.add(new JButton(getSimplifyAction()));
243
        buttons.add(new JButton(getMultiPointAction()));
244
        
248
        buttons.add(new JButton(getScaleAction()));
249
        buttons.add(new JButton(getJoinAction()));
250

  
245 251
    }
246 252

  
247 253
    private JButton getOpenPaletteToolsButton() {
......
620 626

  
621 627
        };
622 628
    }
623
    
629

  
624 630
    private AbstractAction getMultiPointAction() {
625 631
        return new AbstractAction("insert-multipoint") {
626 632

  
......
832 838
        };
833 839
    }
834 840

  
841
    private AbstractAction getAutopolygonAction() {
842
        return new AbstractAction("insert-autopolygon") {
843

  
844
            /**
845
             *
846
             */
847
            private static final long serialVersionUID = -6520053841602571307L;
848

  
849
            public void actionPerformed(ActionEvent e) {
850
                editingContext = swingManager.getEditingContext(mapControl);
851
                editingContext
852
                    .activateService(AutopolygonEditingProviderFactory.PROVIDER_NAME);
853
            }
854
        };
855
    }
856

  
857
    private AbstractAction getJoinAction() {
858
        return new AbstractAction("modify-join") {
859

  
860
            /**
861
             *
862
             */
863
            private static final long serialVersionUID = -6520053841602571307L;
864

  
865
            public void actionPerformed(ActionEvent e) {
866
                editingContext = swingManager.getEditingContext(mapControl);
867
                editingContext
868
                    .activateService(JoinEditingProviderFactory.PROVIDER_NAME);
869
            }
870
        };
871
    }
872

  
873
    private AbstractAction getScaleAction() {
874
        return new AbstractAction("modify-scale") {
875

  
876
            /**
877
             *
878
             */
879
            private static final long serialVersionUID = -6520053841602571307L;
880

  
881
            public void actionPerformed(ActionEvent e) {
882
                editingContext = swingManager.getEditingContext(mapControl);
883
                editingContext
884
                    .activateService(ScaleEditingProviderFactory.PROVIDER_NAME);
885
            }
886
        };
887
    }
888

  
835 889
    private void createMenu() {
836 890
        // Create the menu bar.
837 891
        JMenuBar menuBar = new JMenuBar();
......
848 902
    private JFrame getPaletteTools() {
849 903
        if (paletteTools == null) {
850 904
            paletteTools = new JFrame("Palette tools");
851
            paletteTools.setLayout(new GridLayout(0, 1, 1, 5));
905
            paletteTools.setLayout(new GridLayout(0, 2, 1, 5));
852 906
            paletteTools.setLocation(0, 0);
853 907
            paletteTools
854 908
                .setDefaultCloseOperation(WindowConstants.HIDE_ON_CLOSE);

Also available in: Unified diff