Révision 1410

tmp/org.txm.rcp/plugin.xml (revision 1410)
2079 2079
                     <reference
2080 2080
                           definitionId="OneTXMResultSelected">
2081 2081
                     </reference>
2082
                     <test
2083
                           property="org.txm.rcp.testers.IsParentHidden">
2084
                     </test>
2082 2085
                  </and>
2083 2086
               </visibleWhen>
2084 2087
            </command>
......
2092 2095
                     <reference
2093 2096
                           definitionId="OneTXMResultSelected">
2094 2097
                     </reference>
2098
                     <test
2099
                           property="org.txm.rcp.testers.IsParentVisible"
2100
                           value="true">
2101
                     </test>
2095 2102
                  </and>
2096 2103
               </visibleWhen>
2097 2104
            </command>
......
3014 3021
            properties="AutoPersistenceDisabled"
3015 3022
            type="java.lang.Object">
3016 3023
      </propertyTester>
3024
      <propertyTester
3025
            class="org.txm.rcp.testers.IsParentVisible"
3026
            id="org.txm.rcp.testers.IsParentVisible"
3027
            namespace="org.txm.rcp.testers"
3028
            properties="IsParentVisible"
3029
            type="java.lang.Object">
3030
      </propertyTester>
3031
      <propertyTester
3032
            class="org.txm.rcp.testers.IsParentHidden"
3033
            id="org.txm.rcp.testers.IsParentHidden"
3034
            namespace="org.txm.rcp.testers"
3035
            properties="IsParentHidden"
3036
            type="java.lang.Object">
3037
      </propertyTester>
3017 3038
   </extension>
3018 3039
   <extension
3019 3040
         point="org.eclipse.ui.bindings">
tmp/org.txm.rcp/src/main/java/org/txm/rcp/testers/IsXTZCorpus.java (revision 1410)
20 20
			List<Object> list = (List<Object>)receiver;
21 21
			if (list.size() == 0) return false;
22 22
			receiver = list.get(0);
23
		} else if (receiver instanceof CQPCorpus) {
23
		}
24
		if (receiver instanceof CQPCorpus) {
24 25
			CQPCorpus c = (CQPCorpus) receiver;
25 26
			String script = c.getProject().getImportModuleName();
26 27
			if (script == null) return false;
tmp/org.txm.rcp/src/main/java/org/txm/rcp/testers/IsParentHidden.java (revision 1410)
1
package org.txm.rcp.testers;
2

  
3
import java.util.List;
4

  
5
import org.eclipse.core.expressions.PropertyTester;
6
import org.txm.core.results.TXMResult;
7

  
8
/**
9
 * Checks if the results persistence is enabled.
10
 * 
11
 * @author sjacquot
12
 *
13
 */
14
public class IsParentHidden extends PropertyTester {
15

  
16
	@Override
17
	public boolean test(Object receiver, String property, Object[] args, Object expectedValue) {
18

  
19
		if (receiver instanceof List) {
20
			List list = (List)receiver;
21
			if (list.size() == 0) return false;
22
			receiver = list.get(0);
23
		}
24
		if (receiver instanceof TXMResult) {
25
			return !((TXMResult)receiver).getParent().isVisible();
26
		}
27
		
28
		return false;
29
	}
30
}
0 31

  
tmp/org.txm.rcp/src/main/java/org/txm/rcp/testers/IsParentVisible.java (revision 1410)
1
package org.txm.rcp.testers;
2

  
3
import java.util.List;
4

  
5
import org.eclipse.core.expressions.PropertyTester;
6
import org.txm.core.results.TXMResult;
7

  
8
/**
9
 * Checks if the results persistence is enabled.
10
 * 
11
 * @author sjacquot
12
 *
13
 */
14
public class IsParentVisible extends PropertyTester {
15

  
16
	@Override
17
	public boolean test(Object receiver, String property, Object[] args, Object expectedValue) {
18

  
19
		if (receiver instanceof List) {
20
			List list = (List)receiver;
21
			if (list.size() == 0) return true;
22
			receiver = list.get(0);
23
		}
24
		if (receiver instanceof TXMResult) {
25
			return ((TXMResult)receiver).getParent().isVisible();
26
		}
27
		
28
		return true;
29
	}
30
}
0 31

  
tmp/org.txm.rcp/src/main/java/org/txm/rcp/handlers/results/HideIntermediateParents.java (revision 1410)
48 48
			TXMResult parent = result.getParent();
49 49

  
50 50
			int n = 0;
51
			while (parent != null && parent.isVisible() && !(sel instanceof Project) && !(sel instanceof Workspace)) {
51
			while (parent != null && parent.isVisible() && !parent.isInternalPersistable() && !(sel instanceof Project) && !(sel instanceof Workspace)) {
52 52
				parent.setVisible(false);
53 53
				n++;
54 54
				parent = parent.getParent();

Formats disponibles : Unified diff