WebSVN - OpenConcerto - Diff - Rev 149 and 156 - /trunk/OpenConcerto/src/org/openconcerto/sql/element/SQLElement.java

             nounClass = null;
             base = singular;
+        }
         final Phrase res = new Phrase(Grammar_fr.getInstance(), base, nounClass);
         if (nounClass != null)
-            res.putVariant(Grammar.INDEFINITE_ARTICLE_SINGULAR, singular);
+            res.putVariantIfDifferent(Grammar.INDEFINITE_ARTICLE_SINGULAR, singular);
-        res.putVariant(Grammar.PLURAL, plural);
+        res.putVariantIfDifferent(Grammar.PLURAL, plural);
         return res;
+    }
     // from the most loss of information to the least.
     public static enum ReferenceAction {
      */
     static final public String DEFERRED_CODE = new String("deferred code");
     @GuardedBy("this")
     private SQLElementDirectory directory;
-    private String l18nPkgName;
-    private Class<?> l18nClass;
-    private Phrase name;
+    private Phrase defaultName;
     private final SQLTable primaryTable;
     // used as a key in SQLElementDirectory so it should be immutable
     private String code;
     private ComboSQLRequest combo;
     private ListSQLRequest list;
         super();
         if (primaryTable == null) {
             throw new DBStructureItemNotFound("table is null for " + this.getClass());
+        }
         this.primaryTable = primaryTable;
-        this.setL18nPackageName(null);
         this.setDefaultName(name);
         this.code = code == null ? createCode() : code;
         this.combo = null;
         this.list = null;
         this.rowActions = new ListChangeRecorder<IListeAction>(new ArrayList<IListeAction>());
     public void destroy() {
+    }
     /**
      * Should return the code for this element. This method is only called if the <code>code</code>
+     * parameter of the constructor is <code>null</code>. This implementation returns a string
+     * containing the {@link Class#getName() full name} of the class and the {@link #getTable()
+     * table} name to handle a single class being used for multiple tables. NOTE: this method is
+     * also needed, since a subclass constructor cannot pass <code>this.getClass().getName()</code>
-     * parameter of the constructor is <code>null</code>.
+     * as the code parameter to <code>super</code>.
+     *
      * @return the default code for this element.
      */
     protected String createCode() {
         return getClass().getName() + "-" + getTable().getName();
         return this.ownedLinks != null;
+    }
     // return Path from owner to owned
     private final Set<Path> createPaths(final boolean wantedOwned) {
+        // joins cannot have SQLElementLink
-        assert !(this instanceof JoinSQLElement) : "joins cannot have SQLElementLink : " + this;
+        if (this instanceof JoinSQLElement)
+            return Collections.emptySet();
         final SQLTable thisTable = this.getTable();
         final Set<Link> allLinks = thisTable.getDBSystemRoot().getGraph().getAllLinks(getTable());
         final Set<Path> res = new HashSet<Path>();
         for (final Link l : allLinks) {
             final boolean owned;
+    }
     private synchronized void initRF() {
         if (this.otherLinks != null)
             return;
         final Set<Path> otherPaths = this.createPaths(false);
+        if (otherPaths.isEmpty()) {
+            this.otherLinks = SQLElementLinks.empty();
+        } else {
-        final SetMap<LinkType, SQLElementLink> tmp = new SetMap<LinkType, SQLElementLink>();
+            final SetMap<LinkType, SQLElementLink> tmp = new SetMap<LinkType, SQLElementLink>();
-        for (final Path p : otherPaths) {
+            for (final Path p : otherPaths) {
-            final SQLElement refElem = this.getElementLenient(p.getFirst());
+                final SQLElement refElem = this.getElementLenient(p.getFirst());
-            final SQLElementLink elementLink;
+                final SQLElementLink elementLink;
-            if (refElem == null) {
+                if (refElem == null) {
+                }
-            tmp.add(elementLink.getLinkType(), elementLink);
+                tmp.add(elementLink.getLinkType(), elementLink);
+            }
-        this.otherLinks = new SQLElementLinks(tmp);
+            this.otherLinks = new SQLElementLinks(tmp);
+        }
+    }
     final void setDirectory(final SQLElementDirectory directory) {
         // since this method should only be called at the end of SQLElementDirectory.addSQLElement()
         assert directory == null || directory.getElement(this.getTable()) == this;
         synchronized (this) {
     private final SQLTable getForeignTable(String foreignField) {
         return this.getTable().getBase().getGraph().getForeignTable(this.getTable().getField(foreignField));
+    }
-    public final synchronized String getL18nPackageName() {
-        return this.l18nPkgName;
-    }
-    public final synchronized Class<?> getL18nClass() {
-        return this.l18nClass;
-    }
-    public final void setL18nLocation(Class<?> clazz) {
-        this.setL18nLocation(clazz.getPackage().getName(), clazz);
-    }
-    public final void setL18nPackageName(String name) {
-        this.setL18nLocation(name, null);
-    }
-    /**
-     * Set the location for the localized name.
-     *
-     * @param name a package name, can be <code>null</code> :
-     *        {@link SQLElementDirectory#getL18nPackageName()} will be used.
-     * @param ctxt the class loader to load the resource, <code>null</code> meaning this class.
-     * @see SQLElementDirectory#getName(SQLElement)
-     */
-    public final synchronized void setL18nLocation(final String name, final Class<?> ctxt) {
-        this.l18nPkgName = name;
-        this.l18nClass = ctxt == null ? this.getClass() : ctxt;
-    }
     /**
      * Set the default name, used if no translations could be found.
+     *
      * @param name the default name, if <code>null</code> the {@link #getTable() table} name will be
      *        used.
      */
     public final synchronized void setDefaultName(Phrase name) {
-        this.name = name != null ? name : Phrase.getInvariant(getTable().getName());
+        this.defaultName = name != null ? name : Phrase.getInvariant(getTable().getName());
+    }
     /**
      * The default name.
+     *
      * @return the default name, never <code>null</code>.
      */
     public final synchronized Phrase getDefaultName() {
-        return this.name;
+        return this.defaultName;
+    }
     /**
      * The name of this element in the current locale.
+     *
      *         directory} or if it hasn't a name for this.
      * @see SQLElementDirectory#getName(SQLElement)
      */
     public final Phrase getName() {
         final SQLElementDirectory dir = this.getDirectory();
+        final SQLFieldTranslator trns = dir == null ? null : dir.getTranslator();
-        final Phrase res = dir == null ? null : dir.getName(this);
+        final Phrase res = trns == null ? null : trns.getElementName(this);
         return res == null ? this.getDefaultName() : res;
+    }
     public String getPluralName() {
         return this.getName().getVariant(Grammar.PLURAL);

Dépôt officiel du code source de l'ERP OpenConcerto

svn://code.openconcerto.org/openconcerto

(root)/trunk/OpenConcerto/src/org/openconcerto/sql/element/SQLElement.java - Rev 149 → 156