/ - Diff - Plateforme TXM - Forge du Centre Blaise Pascal

     		// Compute a new progression
     		if(selection instanceof Corpus)	{
     		if (selection instanceof Corpus)	{
     			Corpus corpus = (Corpus) selection;
     			if (!Progression.canRunProgression(corpus)) {

     				result = rcpcommand.clazz.newInstance();
     				result.setParameters(parameters);
     				TXMResultEditorInput editorInput = new TXMResultEditorInput(result);
     				TXMEditorPart editor = TXMEditorPart.openEditor(editorInput, rcpcommand.editor_id);
     				if (editor != null) {
     					return editor;
     				} else	{
     					System.out.println("Failed to open editor: internal error during initialisation.");
     					System.out.println("Failed to open editor with "+cmd+" command and "+parameters+" parameters.");
+    				}
+    			}
     			catch(Exception e) {
     				TXMEditorPart.openEditor(result, rcpcommand.editor_id);
     //				if (editor != null) {
     //					return editor;
     //				} else	{
     //					System.out.println("Failed to open editor: internal error during initialisation.");
     //					System.out.println("Failed to open editor with "+cmd+" command and "+parameters+" parameters.");
     //				}
     			} catch(Exception e) {
     				// TODO Auto-generated catch block
     				e.printStackTrace();
+    			}

     		return this.getEditorInput().getResult().getStringParameterValue(key);
+    	}
     //// TODO commented for now ?
     //	/**
     //	 * Computes the result stored in the specified editor input and opens an editor specified by its id.
     //	 * @param editorInput
     //	 * @param editorPartId
     //	 * @return
     //	 */
     //	public static void openEditor(TXMResultEditorInput editorInput, String editorPartId)	{
     //		compute(editorInput, editorPartId, false, null);
     //	}
     	/**
     	 * Computes the result stored in the specified editor input and opens an editor specified by its id.
     	 * @param editorInput
     	 * @param editorPartId
     	 * @return
     	 */
     	public static void openEditor(TXMResultEditorInput editorInput, String editorPartId)	{
     		compute(editorInput, editorPartId, false, null);
+    	}
     	/**
     	 * Computes specified result stored, creates an editor input and opens an editor specified by its id.
+    	 *
     	 * Always creates an editor
+    	 *
     	 * @param result
     	 * @param editorPartId
     	 * @return
     	 */
     	public static void openEditor(TXMResult result, String editorPartId)	{
     		openEditor(new TXMResultEditorInput(result), editorPartId);
     		//openEditor(new TXMResultEditorInput(result), editorPartId);
     		compute(new TXMResultEditorInput(result), editorPartId, false, null);
+    	}
     	/**
     	 * Computes the TXMResult If all necessary parameters are set AND refresh the editor UI
+    	 *
     	 * @param update transfered to the TXMResult.compute method
     	 */
     	public final void compute(boolean update) {
     		compute(update, this);
     		compute(this.getEditorInput(), null, update, this);
+    	}
     	public static void compute(final boolean update, final TXMEditorPart editor)	{
     		compute(editor.getEditorInput(), null, update, editor);
+    	}
     	/**
     	 * Internal method to mutualize compute editor creation
+    	 *
     	 * @param result
     	 * @param update
-...
     	 * @param resetView
     	 * @param clearChartItemsSelection
     	 */
     	public static void compute(final TXMResultEditorInput editorInput, final String editorId, final boolean update, final TXMEditorPart editor)	{
     	protected static void compute(final TXMResultEditorInput editorInput, final String editorId, final boolean update, final TXMEditorPart editor)	{
     		StatusLine.setMessage("Computing " + editorInput.getResult().getName());
-...
     		    		currentEditor = editor;
     		    		// transfer editor parameters to result
     //		    		if (currentEditor != null)	{
     //		    			currentEditor.updateResultFromEditor();
     //		    		}
     		    		// computing result
     					monitor.beginTask("Computing", 100);
     					editorInput.getResult().compute(update, monitor);
     					editorInput.getResult().compute(update, monitor); // always open the editor
     //					if (!editorInput.getResult().compute(update, monitor))	{
     //						return Status.CANCEL_STATUS;
     //					}
     					monitor.worked(50);
     					// opening an editor if not exists
     					if (currentEditor == null)	{
     					if (currentEditor == null && editorId != null)	{
     						this.syncExec(new Runnable() {
     							@Override
     							public void run() {
-...
     									Log.info("TXMEditorPart.compute(): opening editor with id " + editorId);
     									IWorkbenchWindow window =TXMWindows.getActiveWindow();
     									IWorkbenchWindow window = TXMWindows.getActiveWindow();
     									IWorkbenchPage page = window.getActivePage();
     									currentEditor = (TXMEditorPart) page.openEditor(editorInput, editorId, true, IWorkbenchPage.MATCH_INPUT | IWorkbenchPage.MATCH_ID);
     								} catch (Exception e) {
-...
     						});
+    					}
     					// refreshing the UI
     					if (currentEditor != null)	{
     						this.syncExec(new Runnable() {
-...
+    		    	}
     				return Status.OK_STATUS;
+    		    }
     		};
     		job.setPriority(Job.DECORATE);
     		job.setUser(false);

tmp/org.txm.referencer.rcp/src/org/txm/referencer/rcp/commands/ComputeReferencer.java (revision 568)
85	85	return false;
86	86	}
87	87
88		TXMEditorPart.openEditor(new TXMResultEditorInput(referencer), ReferencerEditor.ID); //$NON-NLS-1$
	88	TXMEditorPart.openEditor(referencer, ReferencerEditor.ID); //$NON-NLS-1$
89	89	return false;
90	90	}
91	91	}

Laboratoire ICAR » Plateforme TXM

Revision 568