[Fudaa-cvs-commit] fudaa_devel/fudaa/src/org/fudaa/fudaa/oscar OscarAstuces.java,1.2,1.3 OscarDialogNoteDeCalculsConfig.java,1.3,1.4 OscarFilleNoteDeCalculs.java,1.4,1.5 OscarFilleParametres.java,1.4,1.5 OscarFilleResultatsBruts.java,1.3,1.4 OscarImplementation.java,1.7,1.8 OscarInternalFrameAdapter.java,1.2,1.3 WHtmlContent.java,1.6,1.7 WTree.java,1.4,1.5

[<de...@us...>]

Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/oscar
In directory sc8-pr-cvs1:/tmp/cvs-serv15566/oscar

Modified Files:
	OscarAstuces.java OscarDialogNoteDeCalculsConfig.java 
	OscarFilleNoteDeCalculs.java OscarFilleParametres.java 
	OscarFilleResultatsBruts.java OscarImplementation.java 
	OscarInternalFrameAdapter.java WHtmlContent.java WTree.java 
Log Message:
Ajout de FudaaCommonImplementation


Index: OscarAstuces.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/oscar/OscarAstuces.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** OscarAstuces.java	19 Mar 2003 07:29:18 -0000	1.2
--- OscarAstuces.java	4 Jul 2003 15:56:40 -0000	1.3
***************
*** 10,15 ****
  package org.fudaa.fudaa.oscar;
  
- import org.fudaa.fudaa.commun.FudaaAstuces;
  import org.fudaa.fudaa.commun.FudaaPreferences;
  import com.memoire.bu.BuPreferences;
  
--- 10,16 ----
  package org.fudaa.fudaa.oscar;
  
  import org.fudaa.fudaa.commun.FudaaPreferences;
+ import org.fudaa.fudaa.commun.aide.FudaaAstuces;
+ 
  import com.memoire.bu.BuPreferences;
  

Index: OscarDialogNoteDeCalculsConfig.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/oscar/OscarDialogNoteDeCalculsConfig.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** OscarDialogNoteDeCalculsConfig.java	19 Mar 2003 07:29:18 -0000	1.3
--- OscarDialogNoteDeCalculsConfig.java	4 Jul 2003 15:56:40 -0000	1.4
***************
*** 11,14 ****
--- 11,15 ----
  
  import org.fudaa.fudaa.commun.*;
+ import org.fudaa.fudaa.commun.projet.*;
  
  import com.memoire.bu.*;

Index: OscarFilleNoteDeCalculs.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/oscar/OscarFilleNoteDeCalculs.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** OscarFilleNoteDeCalculs.java	19 Mar 2003 07:29:17 -0000	1.4
--- OscarFilleNoteDeCalculs.java	4 Jul 2003 15:56:40 -0000	1.5
***************
*** 33,37 ****
  
  import org.fudaa.fudaa.commun.FudaaLib;
! import org.fudaa.fudaa.commun.FudaaProjet;
  
  import org.fudaa.dodico.corba.oscar.SResultatsOscar;
--- 33,37 ----
  
  import org.fudaa.fudaa.commun.FudaaLib;
! import org.fudaa.fudaa.commun.projet.FudaaProjet;
  
  import org.fudaa.dodico.corba.oscar.SResultatsOscar;

Index: OscarFilleParametres.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/oscar/OscarFilleParametres.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** OscarFilleParametres.java	19 Mar 2003 07:29:18 -0000	1.4
--- OscarFilleParametres.java	4 Jul 2003 15:56:40 -0000	1.5
***************
*** 23,28 ****
  import com.memoire.bu.BuCommonInterface;
  
! import org.fudaa.fudaa.commun.FudaaProjet;
! import org.fudaa.fudaa.commun.FudaaParamEventView;
  import org.fudaa.dodico.corba.oscar.SParametresOscar;
  import org.fudaa.dodico.corba.oscar.SCommentairesOscar;
--- 23,28 ----
  import com.memoire.bu.BuCommonInterface;
  
! import org.fudaa.fudaa.commun.projet.FudaaParamEventView;
! import org.fudaa.fudaa.commun.projet.FudaaProjet;
  import org.fudaa.dodico.corba.oscar.SParametresOscar;
  import org.fudaa.dodico.corba.oscar.SCommentairesOscar;

Index: OscarFilleResultatsBruts.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/oscar/OscarFilleResultatsBruts.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** OscarFilleResultatsBruts.java	19 Mar 2003 07:29:17 -0000	1.3
--- OscarFilleResultatsBruts.java	4 Jul 2003 15:56:40 -0000	1.4
***************
*** 26,30 ****
  import com.memoire.bu.BuLabelMultiLine;
  
! import org.fudaa.fudaa.commun.FudaaProjet;
  
  import org.fudaa.dodico.corba.oscar.*;
--- 26,30 ----
  import com.memoire.bu.BuLabelMultiLine;
  
! import org.fudaa.fudaa.commun.projet.FudaaProjet;
  
  import org.fudaa.dodico.corba.oscar.*;

Index: OscarImplementation.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/oscar/OscarImplementation.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** OscarImplementation.java	19 Mar 2003 07:29:18 -0000	1.7
--- OscarImplementation.java	4 Jul 2003 15:56:40 -0000	1.8
***************
*** 22,25 ****
--- 22,28 ----
  import com.diaam.lgpl.ts.TerminalStandard;
  import org.fudaa.fudaa.commun.*;
+ import org.fudaa.fudaa.commun.aide.*;
+ import org.fudaa.fudaa.commun.dodico.*;
+ import org.fudaa.fudaa.commun.projet.*;
  import org.fudaa.fudaa.ressource.*;
  import org.fudaa.fudaa.utilitaire.*;
***************
*** 37,40 ****
--- 40,44 ----
  import org.fudaa.dodico.corba.oscar.*;
  import org.fudaa.dodico.objet.*;
+ import org.fudaa.dodico.usine.UsineHelper;
  import org.fudaa.dodico.corba.objet.*;
  
***************
*** 327,331 ****
  	//assistant_.changeAttitude(BuAssistant.ATTENTE,OscarMsg.ASS001);
  	// Initialisation des préférences
! 	ajoutePreferences(new VolumePreferencesPanel(this));
  
  	_gps.setVisible(true);
--- 331,335 ----
  	//assistant_.changeAttitude(BuAssistant.ATTENTE,OscarMsg.ASS001);
  	// Initialisation des préférences
! 	//ajoutePreferences(new VolumePreferencesPanel(this));
  
  	_gps.setVisible(true);
***************
*** 1271,1275 ****
  	    IOrganisme   organisme;
  	    IConnexion   connexion;
! 	    usine     = CDodico.creeUsineLocale();
  	    organisme = usine.creeObjetOrganisme();
  	    organisme.sigle("organisme local");
--- 1275,1279 ----
  	    IOrganisme   organisme;
  	    IConnexion   connexion;
! 	    usine     = UsineHelper.creeUsineLocale();
  	    organisme = usine.creeObjetOrganisme();
  	    organisme.sigle("organisme local");
***************
*** 1366,1369 ****
--- 1370,1382 ----
  	return !res;
      }
+ 
+   /**
+    *
+    */
+   protected void buildPreferences()
+   {
+     super.buildPreferences();
+     preferences_.addTab(new VolumePreferencesPanel(this));
+   }
  
  }

Index: OscarInternalFrameAdapter.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/oscar/OscarInternalFrameAdapter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** OscarInternalFrameAdapter.java	19 Mar 2003 07:29:18 -0000	1.2
--- OscarInternalFrameAdapter.java	4 Jul 2003 15:56:40 -0000	1.3
***************
*** 10,14 ****
  package org.fudaa.fudaa.oscar;
  
- import java.lang.String;
  
  import javax.swing.JComponent;
--- 10,13 ----
***************
*** 38,48 ****
  import org.fudaa.ebli.impression.*;
  
! import org.fudaa.fudaa.commun.FudaaProjet;
! import org.fudaa.fudaa.commun.FudaaParamEvent;
! import org.fudaa.fudaa.commun.FudaaParamEventView;
! import org.fudaa.fudaa.commun.FudaaProjetEvent;
! import org.fudaa.fudaa.commun.FudaaParamListener;
! import org.fudaa.fudaa.commun.FudaaProjetListener;
! import org.fudaa.fudaa.commun.FudaaParamEventProxy;
  
  import com.memoire.bu.BuResource;
--- 37,47 ----
  import org.fudaa.ebli.impression.*;
  
! import org.fudaa.fudaa.commun.projet.FudaaParamEvent;
! import org.fudaa.fudaa.commun.projet.FudaaParamEventProxy;
! import org.fudaa.fudaa.commun.projet.FudaaParamEventView;
! import org.fudaa.fudaa.commun.projet.FudaaParamListener;
! import org.fudaa.fudaa.commun.projet.FudaaProjet;
! import org.fudaa.fudaa.commun.projet.FudaaProjetEvent;
! import org.fudaa.fudaa.commun.projet.FudaaProjetListener;
  
  import com.memoire.bu.BuResource;

Index: WHtmlContent.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/oscar/WHtmlContent.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** WHtmlContent.java	19 Mar 2003 07:29:18 -0000	1.6
--- WHtmlContent.java	4 Jul 2003 15:56:40 -0000	1.7
***************
*** 1,5 ****
  package org.fudaa.fudaa.oscar;
  
! import org.fudaa.fudaa.commun.FudaaProjet;
  import org.fudaa.dodico.corba.oscar.*;
  import javax.swing.JComponent;
--- 1,5 ----
  package org.fudaa.fudaa.oscar;
  
! import org.fudaa.fudaa.commun.projet.FudaaProjet;
  import org.fudaa.dodico.corba.oscar.*;
  import javax.swing.JComponent;

Index: WTree.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/oscar/WTree.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** WTree.java	19 Mar 2003 07:29:18 -0000	1.4
--- WTree.java	4 Jul 2003 15:56:40 -0000	1.5
***************
*** 1,5 ****
  package org.fudaa.fudaa.oscar;
  
! import org.fudaa.fudaa.commun.FudaaProjet;
  import javax.swing.*;
  import javax.swing.plaf.basic.*;
--- 1,6 ----
  package org.fudaa.fudaa.oscar;
  
! import org.fudaa.fudaa.commun.projet.FudaaProjet;
! 
  import javax.swing.*;
  import javax.swing.plaf.basic.*;