Révision 1152

tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/Part.java (revision 1152)
59 59
		this.pName = partName;
60 60
		this.setVisible(false);
61 61
		this.internalPersistable = true;
62
		this.userPersistable = false;
63 62
	}
64 63
	
65 64
	/**
......
71 70
		
72 71
		this.setVisible(false);
73 72
		this.internalPersistable = true;
74
		this.userPersistable = false;
75 73
	}
76 74
	
77 75
	@Override
tmp/org.txm.core/src/java/org/txm/Toolbox.java (revision 1152)
319 319
				try {
320 320

  
321 321
					Log.finest("Toolbox.initialize(): checking result type linked to node path " + parametersNodePath);
322

  
323 322
					
324 323
					String className = TXMPreferences.preferencesRootNode.node(parametersNodePath).get("class", ""); //$NON-NLS-1$
325 324
					
......
327 326
					//	Log.finest("Toolbox.initialize(): not a project, result skipped (classame = " + className + ").");
328 327
						continue;
329 328
					}
330

  
331 329
					
332 330
					Log.finest("Toolbox.initialize(): loading from result node path " + parametersNodePath);
333 331
					//Log.finest("Toolbox.initialize(): class = " + TXMPreferences.getString("class", nodeQualifier));
334 332
					//TXMPreferences.dump();
335 333
					
336

  
337
					
338 334
					Log.finest("Toolbox.initialize(): class = " + className); //$NON-NLS-1$
339 335
					Log.finest("Toolbox.initialize(): parent_uuid = " + TXMPreferences.preferencesRootNode.node(parametersNodePath).get(TXMPreferences.PARENT_UUID, "")); //$NON-NLS-1$
340 336
					String bundleId = TXMPreferences.preferencesRootNode.node(parametersNodePath).get(TXMPreferences.BUNDLE_ID, ""); //$NON-NLS-1$
tmp/org.txm.core/src/java/org/txm/core/results/TXMResult.java (revision 1152)
1869 1869
				this.children.get(i).setDirty();
1870 1870
			}
1871 1871
			
1872
			// Children cascade computing
1873
			if (deepComputing) {
1872
			// Children cascade computing ; if parent == null this is the Workspace
1873
			if (deepComputing && parent != null) {
1874 1874

  
1875 1875
				Log.finest("TXMResult.compute(): " + this.getClass().getSimpleName() + ": cascade computing of " + this.children.size() + " children.");
1876 1876

  
tmp/org.txm.core/src/java/org/txm/objects/Project.java (revision 1152)
316 316
		}
317 317
	}
318 318

  
319

  
320

  
321

  
322 319
	//	public BasePreferenceScope getPreferenceScope() {
323 320
	//		return scope;
324 321
	//	}
tmp/org.txm.rcp/src/main/java/org/txm/rcp/views/corpora/CorporaView.java (revision 1152)
412 412
//		 	      }
413 413
//		 	   }
414 414
//		 	});
415
		 	treeViewer.getTree().addListener(SWT.PaintItem, new Listener() {
416
		 	   public void handleEvent(Event event) {
417
		 		   if(event.item.getData() instanceof TXMResult && ((TXMResult)event.item.getData()).isUserPersistable())	{
418
			 	      TreeItem item = (TreeItem)event.item;
419
			 	      Image trailingImage = (Image)item.getImage();
420
			 	      if (trailingImage != null) {
421
			 	         //int x = event.x + event.width + IMAGE_MARGIN;
422
			 	        int x = event.x + event.width;
423
			 	        //int x = event.x - 20;
424
			 	       //int x = event.x - 5;
425
			 	         int itemHeight = treeViewer.getTree().getItemHeight();
426
			 	         int imageHeight = trailingImage.getBounds().height;
427
			 	         int y = event.y + (itemHeight - imageHeight) / 2;
428
			 	        //int y = event.y + 5;
429
			 	        
430
			 	       event.gc.drawImage(icon, x, y); 
431
			 	        //event.gc.drawImage(PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_ETOOL_SAVE_EDIT_DISABLED), x, y);
432
			 	      }
433
		 		   }
434
		 	   }
435
		 	});
415
//		 	treeViewer.getTree().addListener(SWT.PaintItem, new Listener() {
416
//		 	   public void handleEvent(Event event) {
417
//		 		   if(event.item.getData() instanceof TXMResult && ((TXMResult)event.item.getData()).isUserPersistable())	{
418
//			 	      TreeItem item = (TreeItem)event.item;
419
//			 	      Image trailingImage = (Image)item.getImage();
420
//			 	      if (trailingImage != null) {
421
//			 	         //int x = event.x + event.width + IMAGE_MARGIN;
422
//			 	        int x = event.x + event.width;
423
//			 	        //int x = event.x - 20;
424
//			 	       //int x = event.x - 5;
425
//			 	         int itemHeight = treeViewer.getTree().getItemHeight();
426
//			 	         int imageHeight = trailingImage.getBounds().height;
427
//			 	         int y = event.y + (itemHeight - imageHeight) / 2;
428
//			 	        //int y = event.y + 5;
429
//			 	        
430
//			 	       event.gc.drawImage(icon, x, y); 
431
//			 	        //event.gc.drawImage(PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_ETOOL_SAVE_EDIT_DISABLED), x, y);
432
//			 	      }
433
//		 		   }
434
//		 	   }
435
//		 	});
436 436
		
437 437
		
438 438
		MenuManager menuManager = new MenuManager();
tmp/org.txm.rcp/src/main/java/org/txm/rcp/adapters/TXMResultAdapter.java (revision 1152)
37 37
	@Override
38 38
	public String getLabel(Object result) {
39 39
		if (result instanceof TXMResult) {
40
			return ((TXMResult) result).getCurrentName();
40
			String star = ((TXMResult) result).isUserPersistable()?"":" *";
41
			return ((TXMResult) result).getCurrentName()+star;
41 42
		}
42 43
		else {
43 44
			return result.toString();
......
62 63

  
63 64
	@Override
64 65
    public RGB getForeground(Object element) {
65
		if(element instanceof TXMResult && !((TXMResult)element).hasBeenComputedOnce())	{
66
	    	Display display = Display.getCurrent();
67
	    	Color color = display.getSystemColor(SWT.COLOR_DARK_GRAY);
68
	    	return color.getRGB();
69
		}
66
//		if(element instanceof TXMResult && !((TXMResult)element).hasBeenComputedOnce())	{
67
//	    	Display display = Display.getCurrent();
68
//	    	Color color = display.getSystemColor(SWT.COLOR_DARK_GRAY);
69
//	    	return color.getRGB();
70
//		}
70 71
		// FIXME: DEbug
71 72
//		else if(element instanceof TXMResult && ((TXMResult)element).isDirty())	{
72 73
//	    	Display display = Display.getCurrent();

Formats disponibles : Unified diff