Révision 3777

TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/p2/plugins/InstallPluginHandler.java (revision 3777)
50 50 
		try {
51 51 
			//FIXME: should be initialized in the default preference initializer
52 52 
			String updateLevel = RCPPreferences.getInstance().getString(RCPPreferences.UPDATE_LEVEL);//$NON-NLS-1$
53 
			boolean alphaMode = false;
53
54 54 
			boolean betaMode = false;
55 
			boolean devMode = false;
56 
			if ("DEV".equals(updateLevel)) {//$NON-NLS-1$
57 
				devMode = alphaMode = betaMode = true;
58 
			} else if ("ALPHA".equals(updateLevel)) {//$NON-NLS-1$
59 
				alphaMode = betaMode = true;
60 
			} else if ("BETA".equals(updateLevel)) {//$NON-NLS-1$
55
56 
			if ("BETA".equals(updateLevel)) {//$NON-NLS-1$
61 57 
				betaMode = true;
62 58 
			}
63 
			Log.fine("Update levels: alpha="+alphaMode+" beta="+betaMode); //$NON-NLS-1$ //$NON-NLS-2$
59 
			Log.fine("Update levels: beta="+betaMode); //$NON-NLS-1$ //$NON-NLS-2$
64 60
65 61 
			Version v = Activator.getDefault().getBundle().getVersion();
66 62 
			String version =  ""+v.getMajor()+"."+v.getMinor()+"."+v.getMicro(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
67 63 
			String uriBase = TBXPreferences.getInstance().getString(TBXPreferences.UPDATESITE)+"/"+version+"/ext"; //$NON-NLS-1$ //$NON-NLS-2$
68 64
69 
			if (devMode) {
70 
				strategy.addLocation(new URI(uriBase+"/dev")); //$NON-NLS-1$
71 
			}
72
73 
			if (alphaMode) {
74 
				strategy.addLocation(new URI(uriBase+"/alpha")); //$NON-NLS-1$
75 
			}
76
77 65 
			if (betaMode) {
78 66 
				strategy.addLocation(new URI(uriBase+"/beta")); //$NON-NLS-1$
79 67 
			}
TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/p2/plugins/TXMUpdateHandler.java (revision 3777)
142 142 
			addDefaultUpdateSites(agent);
143 143 
			addDefaultPluginSites(agent);
144 144
145 
			// add alpha and beta repos if needed
145 
			// add beta repos if needed
146 146 
			// from bundle org.eclipse.equinox.p2.console
147 147
148 148 
			Object ret = super.execute(event);
TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/ApplicationWorkbenchAdvisor.java (revision 3777)
242 242 

  		





  243
  243
  
    
							} else if (RCPPreferences.getInstance().getBoolean(RCPPreferences.DISABLE_TEST_WARNING)) {


  		





  244
  244
  
    

  		





  
  245
  
    
							} else if (RCPPreferences.getInstance().getBoolean(RCPPreferences.EXPERT_USER)) {


  		





  
  246
  
    
								


  		





  245
  247
  
    
							} else {


  		





  
  248
  
    
								


  		





  246
  249
  
    
								Display.getDefault().syncExec( new Runnable() {


  		





  247
  250
  
    

  		





  248
  251
  
    
									@Override


  		












  

    
      TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/preferences/DebugPreferencePage.java	(revision 3777)
    
  






  21
  21
  
    
		


  		





  22
  22
  
    
		// Show all result nodes in Corpora view


  		





  23
  23
  
    
		addField(new BooleanFieldEditor(TBXPreferences.SHOW_ALL_RESULT_NODES, TXMUIMessages.showAllResultNodesInCorporaView, getFieldEditorParent()));


  		





  
  24
  
    
		


  		





  24
  25
  
    
		// change TXM update site base URL


  		





  25
  26
  
    
		addField(new StringFieldEditor(TBXPreferences.UPDATESITE, TXMUIMessages.UpdateSiteAddress, getFieldEditorParent()));


  		





  
  27
  
    
		


  		





  26
  28
  
    
		// enable some Eclipse features deactivated for TXM


  		





  27
  29
  
    
		addField(new BooleanFieldEditor(TBXPreferences.EXPERT_USER, "Expert mode", getFieldEditorParent()));


  		





  28
  30
  
    
		


  		





  29
  
  
    
		addField(new BooleanFieldEditor(RCPPreferences.DISABLE_TEST_WARNING, "Disable the test warning dialog when testing TXM", getFieldEditorParent()));


  		





  
  31
  
    
		addField(new BooleanFieldEditor(RCPPreferences.DISABLE_TEST_WARNING, "Disable the warning dialog when testing TXM", getFieldEditorParent()));


  		





  30
  32
  
    
	}


  		





  31
  33
  
    
	


  		





  32
  34
  
    
	


  		





  ......




  43
  45
  
    
			CorporaView.refresh();


  		





  44
  46
  
    
			return true;


  		





  45
  47
  
    
		}


  		





  46
  
  
    
		;


  		





  
  48
  
    
		


  		





  47
  49
  
    
		return false;


  		





  48
  50
  
    
	}


  		





  49
  51
  
    
}


  		












Formats disponibles :
  Unified diff