Revision 1066 org.gvsig.scripting/trunk/org.gvsig.scripting/org.gvsig.scripting.swing/org.gvsig.scripting.swing.impl/src/main/java/org/gvsig/scripting/swing/impl/DefaultScriptingUIManager.java
DefaultScriptingUIManager.java | ||
---|---|---|
46 | 46 |
import org.gvsig.scripting.swing.impl.composer.editors.DialogEditor; |
47 | 47 |
import org.gvsig.scripting.swing.impl.composer.editors.DialogEditorFactory; |
48 | 48 |
import org.gvsig.scripting.swing.impl.composer.editors.ExternalFileEditorFactory; |
49 |
import org.gvsig.scripting.swing.impl.composer.editors.FolderEditorFactory; |
|
49 | 50 |
import org.gvsig.scripting.swing.impl.composer.editors.PropertiesEditorFactory; |
50 |
import org.gvsig.scripting.swing.impl.composer.editors.ScriptEditor; |
|
51 |
import org.gvsig.scripting.swing.impl.composer.editors.ScriptEditorFactory; |
|
51 |
import org.gvsig.scripting.swing.impl.composer.editors.ScriptUnitEditor; |
|
52 |
import org.gvsig.scripting.swing.impl.composer.editors.ScriptUnitEditorFactory; |
|
53 |
import org.gvsig.scripting.swing.impl.composer.editors.SimpleScriptEditor; |
|
52 | 54 |
import org.gvsig.scripting.swing.impl.composer.editors.TextEditorFactory; |
53 | 55 |
import org.gvsig.scripting.swing.impl.syntaxhighlight.JEditorPaneSyntaxHighlighting; |
54 | 56 |
import org.gvsig.scripting.swing.impl.syntaxhighlight.JRSyntaxTextArea; |
... | ... | |
70 | 72 |
implements ScriptingUIManager |
71 | 73 |
{ |
72 | 74 |
|
73 |
private final static Logger logger = LoggerFactory.getLogger(DefaultScriptingUIManager.class);
|
|
75 |
private final static Logger LOGGER = LoggerFactory.getLogger(DefaultScriptingUIManager.class);
|
|
74 | 76 |
|
75 | 77 |
private final ScriptingManager manager; |
76 | 78 |
private final Map<String, URL> userHelps = new HashMap<>(); |
... | ... | |
114 | 116 |
|
115 | 117 |
private void init() { |
116 | 118 |
this.registerEditor(new DialogEditorFactory()); |
117 |
this.registerEditor(new ScriptEditorFactory()); |
|
119 |
this.registerEditor(new ScriptUnitEditorFactory());
|
|
118 | 120 |
this.registerEditor(new TextEditorFactory()); |
119 | 121 |
this.registerEditor(new ExternalFileEditorFactory()); |
120 | 122 |
this.registerEditor(new PropertiesEditorFactory()); |
123 |
this.registerEditor(new FolderEditorFactory()); |
|
121 | 124 |
} |
122 | 125 |
|
123 | 126 |
@Override |
... | ... | |
149 | 152 |
s = component.getClass().getName(); |
150 | 153 |
} catch(Throwable th1) { |
151 | 154 |
} |
152 |
logger.warn("Problems call listener",th);
|
|
155 |
LOGGER.warn("Problems call listener",th);
|
|
153 | 156 |
} |
154 | 157 |
} |
155 | 158 |
} |
... | ... | |
191 | 194 |
ClassLoader loader = this.getClass().getClassLoader(); |
192 | 195 |
URL url = loader.getResource("org/gvsig/scripting/images/" + tamanyo + name + ".png"); |
193 | 196 |
if (url == null) { |
194 |
url = loader.getResource("org/gvsig/scripting/images/" + tamanyo + "image-missing.png"); |
|
197 |
url = loader.getResource("org/gvsig/scripting/images/" + tamanyo + "scripting-image-missing.png");
|
|
195 | 198 |
} |
196 | 199 |
if (url == null) { |
197 | 200 |
return new ImageIcon(); |
... | ... | |
229 | 232 |
private void showWindow(JComponent panel, String title, WindowManager.MODE mode) { |
230 | 233 |
WindowManager winmanager = this.getWindowManager(); |
231 | 234 |
if( winmanager instanceof WindowManager_v2 ) { |
232 |
((WindowManager_v2)winmanager).showWindow(panel, title, mode, getIcon("scripting_python").getImage());
|
|
235 |
((WindowManager_v2)winmanager).showWindow(panel, title, mode, getIcon("scripting-icon-python").getImage());
|
|
233 | 236 |
} else { |
234 | 237 |
winmanager.showWindow(panel, title, mode); |
235 | 238 |
} |
... | ... | |
264 | 267 |
|
265 | 268 |
@Override |
266 | 269 |
public JCodeEditor createJCodeEditor(ScriptingScript script) { |
267 |
JCodeEditor editor = new ScriptEditor(this, script); |
|
270 |
JCodeEditor editor = new ScriptUnitEditor(this, script);
|
|
268 | 271 |
fireCreateComponent(editor); |
269 | 272 |
return editor; |
270 | 273 |
} |
... | ... | |
291 | 294 |
try { |
292 | 295 |
return new JRSyntaxTextArea(); |
293 | 296 |
} catch (Throwable t) { |
294 |
logger.info("Can't create advanced SyntaxHighlightingPanel.", t);
|
|
297 |
LOGGER.info("Can't create advanced SyntaxHighlightingPanel.", t);
|
|
295 | 298 |
return new JEditorPaneSyntaxHighlighting(); |
296 | 299 |
} |
297 | 300 |
} |
... | ... | |
362 | 365 |
break; |
363 | 366 |
} |
364 | 367 |
} catch(Exception ex) { |
365 |
logger.warn("Can't create an editor with factory '"+factory.getClass().getName()+"' for '"+unit.getClass().getName()+"'.",ex);
|
|
368 |
LOGGER.warn("Can't create an editor with factory '"+factory.getClass().getName()+"' for '"+unit.getClass().getName()+"'.",ex);
|
|
366 | 369 |
} |
367 | 370 |
} |
368 | 371 |
return editor; |
... | ... | |
379 | 382 |
return true; |
380 | 383 |
} |
381 | 384 |
} catch(Exception ex) { |
382 |
logger.warn("Can't check if factory '"+factory.getClass().getName()+"' can create an editor for '"+unit.getClass().getName()+"'.",ex);
|
|
385 |
LOGGER.warn("Can't check if factory '"+factory.getClass().getName()+"' can create an editor for '"+unit.getClass().getName()+"'.",ex);
|
|
383 | 386 |
} |
384 | 387 |
} |
385 | 388 |
return false; |
... | ... | |
437 | 440 |
ScriptListPickerController x = new ScriptListPickerController(list, remove, chooser); |
438 | 441 |
return x; |
439 | 442 |
} |
443 |
|
|
444 |
@Override |
|
445 |
public SimpleScriptEditor createScriptEditor() { |
|
446 |
SimpleScriptEditor x = new SimpleScriptEditor(); |
|
447 |
return x; |
|
448 |
} |
|
449 |
|
|
440 | 450 |
} |
Also available in: Unified diff