Re: [Thinlet-development] thinlet/src/thinlet Thinlet.java,1.8,1.9 Widget.java,1.6,1.7

[Andrzej B. <ab...@ge...>]

ba...@us... wrote:
> Update of /cvsroot/thinlet/thinlet/src/thinlet
> In directory sc8-pr-cvs1:/tmp/cvs-serv25476/src/thinlet
> 
> Modified Files:
> 	Thinlet.java Widget.java 
> Log Message:
> scrollable and titled panel, scrollable dialog content
> 

Widget.java is broken because of unresolved merging. You should have 
corrected this error first, before committing. CVS informs you during 
update operation that there were conflicts, like this:

C Widget.java

This means that the file needs to be edited, and the conflict marks 
removed before the commit operation.

Please correct it.

Also, the table headers are still broken, and now the selection on trees 
and lists works funky - sometimes when you click it's wrong items that 
are selected, sometimes none at all.

> 
> Index: Widget.java
> ===================================================================
> RCS file: /cvsroot/thinlet/thinlet/src/thinlet/Widget.java,v
> retrieving revision 1.6
> retrieving revision 1.7
> diff -u -d -r1.6 -r1.7
> --- Widget.java	19 Mar 2003 23:36:51 -0000	1.6
> +++ Widget.java	24 Mar 2003 19:46:41 -0000	1.7
> @@ -17,6 +17,13 @@
>  		widget = Thinlet.create(classname);
>  	}
>  	
> +<<<<<<< Widget.java
> +	public String getClassName() { 
> +		return null;
> +	}
> +	
> +=======
> +>>>>>>> 1.6
>  	/**
>  	 *
>  	 */



-- 

-- 
Best regards,
Andrzej Bialecki

-------------------------------------------------
Software Architect, System Integration Specialist
CEN/ISSS EC Workshop, ECIMF project chair
EU FP6 E-Commerce Expert/Evaluator
-------------------------------------------------
FreeBSD developer (http://www.freebsd.org)