bshcommands.patch

Antonio Falciano, 09/23/2017 07:25 PM

Download (8.72 KB)

View differences:

org.gvsig.toolbox.gui/src/main/java/es/unex/sextante/gui/cmd/bshcommands/close.java (copia locale)
11 11
                             final CallStack callstack,
12 12
                             final String sName) {
13 13

  
14
      SextanteGUI.getInputFactory().createDataObjects();
14 15
      final Object obj = SextanteGUI.getInputFactory().getInputFromName(sName.trim());
15 16
      if (obj == null) {
16 17
         env.println("Invalid object: " + sName.trim());
org.gvsig.toolbox.gui/src/main/java/es/unex/sextante/gui/cmd/bshcommands/data.java (copia locale)
19 19
   public static void invoke(final Interpreter env,
20 20
                             final CallStack callstack) {
21 21

  
22
      SextanteGUI.getInputFactory().createDataObjects();
22 23
      final StringBuffer sb = new StringBuffer();
23 24
      final IRasterLayer[] rasterLayers = SextanteGUI.getInputFactory().getRasterLayers();
24 25
      sb.append("RASTER LAYERS\n");
org.gvsig.toolbox.gui/src/main/java/es/unex/sextante/gui/cmd/bshcommands/describe.java (copia locale)
20 20
                             final CallStack callstack,
21 21
                             final String sName) {
22 22

  
23
      SextanteGUI.getInputFactory().createDataObjects();
23 24
      final Object obj = SextanteGUI.getInputFactory().getInputFromName(sName.trim());
24 25
      if (obj == null) {
25 26
         env.println("Invalid object: " + sName.trim());
org.gvsig.toolbox.gui/src/main/java/es/unex/sextante/gui/cmd/bshcommands/extent.java (copia locale)
23 23
   public static void invoke(final Interpreter env,
24 24
                             final CallStack callstack,
25 25
                             final String sLayer) {
26

  
27
      SextanteGUI.getInputFactory().createDataObjects();
26 28
      try {
27 29
         final ILayer layer = (ILayer) SextanteGUI.getInputFactory().getInputFromName(sLayer);
28 30
         if ((layer instanceof I3DRasterLayer) || (layer instanceof IRasterLayer)) {
......
44 46
                             final String sLayer,
45 47
                             final double dCellSize) {
46 48

  
49
      SextanteGUI.getInputFactory().createDataObjects();
47 50
      try {
48 51
         final IVectorLayer layer = (IVectorLayer) SextanteGUI.getInputFactory().getInputFromName(sLayer);
49 52
         final AnalysisExtent ge = new AnalysisExtent();
......
60 63
         env.println("Could not set analysis extent");
61 64
      }
62 65

  
63

  
64 66
   }
65 67

  
66 68

  
......
72 74
                             final double yMax,
73 75
                             final double dCellSize) {
74 76

  
77
      SextanteGUI.getInputFactory().createDataObjects();
75 78
      try {
76 79
         final AnalysisExtent ge = new AnalysisExtent();
77 80
         ge.setCellSize(dCellSize);
......
97 100
                             final double dCellSize,
98 101
                             final double dCellSizeZ) {
99 102

  
103
      SextanteGUI.getInputFactory().createDataObjects();
100 104
      try {
101 105
         final AnalysisExtent ae = new AnalysisExtent();
102 106
         ae.setCellSize(dCellSize);
org.gvsig.toolbox.gui/src/main/java/es/unex/sextante/gui/cmd/bshcommands/getrasterlayers.java (copia locale)
11 11
   public static String[] invoke(final Interpreter env,
12 12
                                 final CallStack callstack) {
13 13

  
14
      SextanteGUI.getInputFactory().createDataObjects();
14 15
      final IRasterLayer[] rasterLayers = SextanteGUI.getInputFactory().getRasterLayers();
15 16
      final String[] sNames = new String[rasterLayers.length];
16 17
      for (int i = 0; i < rasterLayers.length; i++) {
org.gvsig.toolbox.gui/src/main/java/es/unex/sextante/gui/cmd/bshcommands/gettables.java (copia locale)
10 10
   public static String[] invoke(final Interpreter env,
11 11
                                 final CallStack callstack) {
12 12

  
13
      SextanteGUI.getInputFactory().createDataObjects();
13 14
      final ITable[] tables = SextanteGUI.getInputFactory().getTables();
14 15
      final String[] sNames = new String[tables.length];
15 16
      for (int i = 0; i < tables.length; i++) {
org.gvsig.toolbox.gui/src/main/java/es/unex/sextante/gui/cmd/bshcommands/getvectorlayers.java (copia locale)
11 11
   public static String[] invoke(final Interpreter env,
12 12
                                 final CallStack callstack) {
13 13

  
14
      SextanteGUI.getInputFactory().createDataObjects();
14 15
      final IVectorLayer[] vectorLayers = SextanteGUI.getInputFactory().getVectorLayers(AbstractInputFactory.SHAPE_TYPE_ANY);
15 16
      final String[] sNames = new String[vectorLayers.length];
16 17
      for (int i = 0; i < vectorLayers.length; i++) {
org.gvsig.toolbox.gui/src/main/java/es/unex/sextante/gui/cmd/bshcommands/rename.java (copia locale)
18 18
                             final String sName,
19 19
                             final String sNewName) {
20 20

  
21
      SextanteGUI.getInputFactory().createDataObjects();
21 22
      final Object obj = SextanteGUI.getInputFactory().getInputFromName(sName.trim());
22 23
      if (obj == null) {
23 24
         env.println("Invalid object: " + sName.trim());
24
      }
25
      if (obj instanceof IDataObject) {
25
      } else if (obj instanceof IDataObject) {
26 26
         ((IDataObject) obj).setName(sNewName);
27 27
      }
28 28

  
org.gvsig.toolbox.gui/src/main/java/es/unex/sextante/gui/cmd/bshcommands/runalg.java (copia locale)
235 235
                             final String sAlgName,
236 236
                             final Object[] args) {
237 237

  
238
      SextanteGUI.getInputFactory().createDataObjects();
238 239
      final String[] sArgs = new String[args.length];
239 240
      for (int i = 0; i < args.length; i++) {
240 241
         sArgs[i] = args[i].toString();
org.gvsig.toolbox.gui/src/main/java/es/unex/sextante/gui/cmd/bshcommands/setnodata.java (copia locale)
18 18
                             final String sName,
19 19
                             final double dNoDataValue) {
20 20

  
21
      SextanteGUI.getInputFactory().createDataObjects();
21 22
      final Object obj = SextanteGUI.getInputFactory().getInputFromName(sName.trim());
22 23
      if (obj == null) {
23 24
         env.println("Invalid object: " + sName.trim());