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

Révision 571

tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/TXMEditorPart.java (revision 571)
359	359
360	360	StatusLine.setMessage("Computing " + editorInput.getResult().getName());
361	361
362		JobHandler job = new JobHandler("Computing result") {
	362	JobHandler job = new JobHandler("Computing "+editorInput.getResult()) {
363	363
364	364	TXMEditorPart currentEditor = null;
365	365
...	...
412	412	}
413	413	}
414	414	// for user direct canceling
415		catch(ThreadDeath td) {
	415	catch (ThreadDeath td) {
416	416	// FIXME should call clean() and/or set the result as dirty?
417	417	return Status.CANCEL_STATUS;
418	418	}
419		catch(Exception e) {
	419	catch (Exception e) {
420	420	System.out.println(e.getLocalizedMessage());
421	421	Log.printStackTrace(e);
422	422	}

tmp/org.txm.index.rcp/src/org/txm/index/rcp/editors/IndexEditor.java (revision 571)
236	236	fillDisplayArea();
237	237
238	238	viewer.getTable().setFocus();
239		super.refresh(update);
240	239	// }
241	240	// });
242	241	//

tmp/org.txm.core/src/java/org/txm/core/results/Parameter.java (revision 571)
23	23	// FIXME: could be used to automate saveParameters(), loadParameters(), etc. for accessing the preferences node value of a key in TXMResult class
24	24	public String key() default "";
25	25
26
27	26	public int type() default Parameter.COMPUTING;
28	27	}

     	 * If set, allows the command to notify its progress.
     	 */
     	protected IProgressMonitor monitor;
     	/**
     	 * To manage the computing cancel with TreadDeath.
     	 */
-...
     	 * To keep track of the parameters used for the last computing and to determine if the result is dirty.
     	 */
     	protected HashMap<String, Object> lastComputingParameters = new HashMap<String, Object>();
     	public HashMap<String, Object> getLastComputingParameters() {
     		return lastComputingParameters;
+    	}
     	/**
     	 * Creates a new TXMResult, child of the specified parent.
+    	 *
-...
     		this.dirty = true;
+    	}
     //	/**
     //	 * Creates a new TXMResult with no parent.
     //	 */
     //	public TXMResult() {
     //		this(null);
     //	}
     	//	/**
     	//	 * Creates a new TXMResult with no parent.
     	//	 */
     	//	public TXMResult() {
     	//		this(null);
     	//	}
     	/**
     	 * Creates and stores an UUID dedicated to persistence of this result.
     	 */
-...
     			lastComputingParameters.put(name, f.get(this));
+    		}
+    	}
     	protected Object getParameterForKey(String key) {
     		Field[] fields = this.getClass().getDeclaredFields();
     		for (Field f : fields) {
-...
+    		}
     		return null;
+    	}
     	protected boolean hasParameterChanged(String key) {
     		if ("".equals(key)) {
     			return false;
-...
     			return o.equals(newValue);
+    		}
+    	}
     	/**
     	 * Updates the dirty states by comparing TXMResult @Parameter with previously used parameters in the compute() method.
+    	 *
-...
     		return dirty;
+    	}
     	/**
     	 * Updates the dirty state by comparing an old parameter with a new one.
+    	 *
-...
+    		}
+    	}
     	/**
     	 * Gets the dirty states.
+    	 *
-...
     		return TXMPreferences.getKeys(this.preferencesNodeQualifier);
+    	}
     	/**
     	 * Gets the value of the specified key in parameters, local result node or
     	 * default preferences nodes.
-...
     		return TXMPreferences.getString(key, this, this.preferencesNodeQualifier);
+    	}
     	/**
     	 * Stores the specified parameters pairs of key/value in a local node dedicated to the specified result. The node qualifier is generated by the <code>TXMResult.getUUID</code> method.
+    	 *
-...
     		TXMPreferences.putLocal(this, key, StringUtils.join(values, UNDERSCORE));
+    	}
     	/**
     	 * Stores the specified parameters pairs of key/value in a local node dedicated to the specified result. The node qualifier is generated by the <code>TXMResult.getUUID</code> method.
     	 * @param result
-...
     		TXMPreferences.putLocal(this, key, value);;
+    	}
     	/**
     	 * Copies the parameters stored in the @Parameter Java class members : the pXXXXX named members to the local preferences node.
     	 * Commands must define this method to persist their parameters.
-...
     	 * @return
     	 */
     	// FIXME: need to implement here a generic way to save @Parameter
     	public boolean saveParameters() {
     	public boolean saveParameters() throws Exception {
     		Class clazz = this.getClass();
     		Field[] fields = clazz.getDeclaredFields();
     		for (Field f : fields) {
     			if (f.getClass().equals(Integer.class)) {
+    			}
     			Parameter parameter = f.getAnnotation(Parameter.class);
     			if (parameter == null || parameter.type() != Parameter.COMPUTING) {
     				continue;
+    			}
     			String key = parameter.key();
     			if ("".equals(key)) {
     				continue; // no preference key defined
+    			}
     			// only manage simple types
     			if (f.getClass().equals(Integer.class) ||
     					f.getClass().equals(String.class) ||
     					f.getClass().equals(Double.class) ||
     					f.getClass().equals(Float.class) ||
     					f.getClass().equals(Boolean.class)) {
     				f.setAccessible(true); // set accessible to test the field values
     				try {
     					Object newValue = f.get(this);
     					if (newValue != null) {
     						this.saveParameter(key, newValue);
+    					}
     				} catch (Exception e) {
     					e.printStackTrace();
+    				}
+    			}
+    		}
     		return true;
+    	}
     	/**
     	 * Initialize the @Parameter class members objects
     	 * Initialize the @Parameter class members objects using the default and persisted values in the Preference Store
+    	 *
     	 * @param parameters
     	 * extends and call this method if you need to load parameter with not simple type (e.g. Property, List, HashMap...)
+    	 *
     	 * @return
     	 * @throws Exception
     	 * @throws Exception
     	 */
     	public abstract boolean setParameters(TXMParameters parameters) throws Exception;
     	public boolean loadParameters() throws Exception {
     		Class clazz = this.getClass();
     		Field[] fields = clazz.getDeclaredFields();
     		for (Field f : fields) {
     			Parameter parameter = f.getAnnotation(Parameter.class);
     			if (parameter == null || parameter.type() != Parameter.COMPUTING) {
     				continue;
+    			}
     			String key = parameter.key();
     			if ("".equals(key)) {
     				continue; // no preference key defined
+    			}
     			try {
     				f.setAccessible(true); // set accessible to test the field values
     				// only manage simple persisted types
     				if (f.getClass().equals(String.class)) {
     					String persistedValue = this.getStringParameterValue(key);
     					if (persistedValue != null) {
     						f.set(this, persistedValue);
+    					}
     				} else if (f.getClass().equals(Integer.class)) {
     					Integer persistedValue = this.getIntParameterValue(key);
     					if (persistedValue != null) {
     						f.set(this, persistedValue);
+    					}
     				} else if (f.getClass().equals( Double.class)) {
     					Double persistedValue = this.getDoubleParameterValue(key);
     					if (persistedValue != null) {
     						f.set(this, persistedValue);
+    					}
     				} else if (f.getClass().equals(Float.class)) {
     					Float persistedValue = this.getFloatParameterValue(key);
     					if (persistedValue != null) {
     						f.set(this, persistedValue);
+    					}
     				} else if (f.getClass().equals(Boolean.class)) {
     					Boolean persistedValue = this.getBooleanParameterValue(key);
     					if (persistedValue != null) {
     						f.set(this, persistedValue);
+    					}
+    				}
     			} catch (Exception e) {
     				e.printStackTrace();
+    			}
+    		}
     		return true;
+    	}
     	/**
     	 * Initialize the @Parameter class members objects using the default and persisted values in the Preference Store
     	 * Initialize the @Parameter class members objects
+    	 *
     	 * @param parameters
     	 * @return
     	 * @throws Exception
     	 */
     	public abstract boolean loadParameters() throws Exception;
     	public abstract boolean setParameters(TXMParameters parameters) throws Exception;
     	/**
     	 * Deletes the object from its parent, also deletes the children. The <code>TXMResult.clean()</code> methods of this result and children results are applied before the deletion.
+    	 *
-...
     			return false;
+    		}
     //		// TODO THIS IS FUCKING LAZY LINE CODES OH YEAH YOU MAD BRO
     		//		// TODO THIS IS FUCKING LAZY LINE CODES OH YEAH YOU MAD BRO
     		// TODO where do we put this parent compute ? :o
     		//		if (parent != null && !parent.getHasBeenComputedOnce()) { // parent must be computed at least one time
     		// SJ: other way, test the object itself
     		// 		if (parent != null && !this.getHasBeenComputedOnce()) {
     		//			this.parent.compute(update, monitor);
     		//		}
     		if (!this._compute(update)) {
     			// FIXME: Debug
-...
     	 */
     	protected abstract boolean _compute(boolean update) throws Exception;
     	// //removed for now, waiting to see if used
     	// /**
     	// * Computes the result according to specified command parameters.
     	// * @param watcher
     	// * @param parameters
     	// * @return
     	// */
     	// public boolean compute(IProgressMonitor monitor, TXMParameters
     	// parameters) throws Exception {
     	// this.parameters = parameters;
     	// return this.compute(monitor);
     	// }
     	/**
     	 * Copies the parameters from the local preference node if exists. Also fills the non existent parameters with the command default preferences.
     	 */
     	//public abstract void loadParameters();
     	/**
+    	 *
     	 * @return the array of extensions to show in the FileDialog SWT widget
     	 */
-...
     	/**
     	 * increment the process
+    	 *
     	 * @param amount
     	 *            of work
     	 * @param amount of work
     	 */
     	public void worked(int amount) {
     		if (monitor != null) {

Formats disponibles : Unified diff

Laboratoire ICAR » Plateforme TXM

Révision 571