Revision 1439

tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/TXMEditor.java (revision 1439)
974 974
										}
975 975
									}
976 976
									// TXMMultiPageEditor
977
//									else if(editor != null && editor instanceof TXMMultiPageEditor && editor != this)	{
978
//										TXMMultiPageEditor txmMultipageEditor = ((TXMMultiPageEditor)editor);
979
//										for (int i = 0; i < txmMultipageEditor.getEditors().size(); i++) {
980
//											if(txmMultipageEditor.getEditors().get(i) instanceof TXMEditor && txmMultipageEditor.getEditors().get(i) != this)	{
981
//												TXMEditor txmEditor = ((TXMEditor)txmMultipageEditor.getEditors().get(i));
982
//												if(this.getResult().isChild(txmEditor.getResult()))	{
983
////													Log.finest("TXMEditor.refresh(): updating editor for result: " + txmEditor.getResult().getSimpleName());
984
////													Log.finest("TXMEditor.refresh(): " + txmEditor.getClass().getSimpleName() + ": manually updating result from editor."); //$NON-NLS-1$
985
////													txmEditor.updateResultFromEditor(); // subclasses manual result updating from editor fields
986
////													// FIXME: DEbug
987
////													Log.finest("TXMEditor.refresh(): " + txmEditor.getClass().getSimpleName() + ": auto updating result from editor."); //$NON-NLS-1$
988
////													txmEditor.autoUpdateResultFromEditorParameters(); // auto updating result from Parameter annotations in result <=> editor
989
////													//txmEditor.compute(false);
990
////													//txmEditor.updateEditorFromResult(true);
991
//													
992
//													txmEditor.synchronizeResultFromEditor();
993
//													
994
//													//txmEditor.refresh(true);
995
//												}
996
//											}
997
//										}
998
//										
999
//									}
977
									else if(editor != null && editor instanceof TXMMultiPageEditor && editor != this)	{
978
										TXMMultiPageEditor txmMultipageEditor = ((TXMMultiPageEditor)editor);
979
										for (int i = 0; i < txmMultipageEditor.getEditors().size(); i++) {
980
											if(txmMultipageEditor.getEditors().get(i) instanceof TXMEditor && txmMultipageEditor.getEditors().get(i) != this)	{
981
												TXMEditor txmEditor = ((TXMEditor)txmMultipageEditor.getEditors().get(i));
982
												if(this.getResult().isChild(txmEditor.getResult()))	{
983
//													Log.finest("TXMEditor.refresh(): updating editor for result: " + txmEditor.getResult().getSimpleName());
984
//													Log.finest("TXMEditor.refresh(): " + txmEditor.getClass().getSimpleName() + ": manually updating result from editor."); //$NON-NLS-1$
985
//													txmEditor.updateResultFromEditor(); // subclasses manual result updating from editor fields
986
//													// FIXME: DEbug
987
//													Log.finest("TXMEditor.refresh(): " + txmEditor.getClass().getSimpleName() + ": auto updating result from editor."); //$NON-NLS-1$
988
//													txmEditor.autoUpdateResultFromEditorParameters(); // auto updating result from Parameter annotations in result <=> editor
989
//													//txmEditor.compute(false);
990
//													//txmEditor.updateEditorFromResult(true);
991
													
992
													txmEditor.synchronizeResultFromEditor();
993
													
994
													txmEditor.refresh(true);
995
												}
996
											}
997
										}
998
										
999
									}
1000 1000
								}
1001 1001

  
1002 1002
		notifyExtensions("notifyEndOfRefresh"); //$NON-NLS-1$
tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/editors/CAFactorialMapChartEditor.java (revision 1439)
100 100
	public void __createPartControl() {
101 101

  
102 102
		// Main parameters
103
		GLComposite mainParametersArea = this.getMainParametersComposite();
103 104

  
104 105
		try {
105
			GLComposite mainParametersArea = this.getMainParametersComposite();
106
			mainParametersArea.getLayout().numColumns = 2;
106
			// parent parameters
107
			if (!this.getResult().getParent().isVisible())	{
108
				mainParametersArea.getLayout().numColumns = 2;
107 109

  
108
			// unit property
109
			new Label(mainParametersArea, SWT.NONE).setText(TXMCoreMessages.common_property);
110
			this.unitPropertyComboViewer = new PropertiesComboViewer(mainParametersArea, this, true,
111
					CQPCorpus.getFirstParentCorpus(this.getResult()).getOrderedProperties(),
112
					this.getResult().getUnitProperty(), false);
110
				// unit property
111
				new Label(mainParametersArea, SWT.NONE).setText(TXMCoreMessages.common_property);
112
				this.unitPropertyComboViewer = new PropertiesComboViewer(mainParametersArea, this, true,
113
						CQPCorpus.getFirstParentCorpus(this.getResult()).getOrderedProperties(),
114
						this.getResult().getUnitProperty(), false);
115
			}
113 116

  
114 117
		}
115 118
		catch (CqiClientException e) {

Also available in: Unified diff