xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch '13.2.1_delivery' into development

Browse source 
Former-commit-id: d997d99f05 [formerly 815e8b741b173044f8f20f537674d685b50ed6af]
Former-commit-id: f380667b34
This commit is contained in:
Steve Harris 2013-02-04 15:26:44 -06:00
commit 930f1f13c0
4 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/AbstractGridResource.java
View file

@ -51,6 +51,7 @@ import com.raytheon.uf.viz.core.IGraphicsTarget;
import com.raytheon.uf.viz.core.VizApp;
import com.raytheon.uf.viz.core.drawables.ColorMapLoader;
import com.raytheon.uf.viz.core.drawables.ColorMapParameters;
import com.raytheon.uf.viz.core.drawables.ColorMapParameters.PersistedParameters;
import com.raytheon.uf.viz.core.drawables.IRenderable;
import com.raytheon.uf.viz.core.drawables.PaintProperties;
import com.raytheon.uf.viz.core.exception.VizException;
@ -595,6 +596,13 @@ public abstract class AbstractGridResource<T extends AbstractResourceData>
// reuse the old parameters. This is useful when the resource is
// sharing capabilities, for example in an FFGVizGroupResource.
newParameters = oldParameters;
} else if (oldParameters != null) {
newParameters.setColorMapName(oldParameters.getColorMapName());
newParameters.setColorMap(oldParameters.getColorMap());
PersistedParameters persisted = oldParameters.getPersisted();
if (persisted != null) {
newParameters.applyPersistedParameters(persisted);
}
}
return newParameters;
}

4
edexOsgi/com.raytheon.uf.common.registry.schemas.ebxml/src/oasis/names/tc/ebxml/regrep/xsd/rim/v4/ExtensibleObjectType.java
View file

@ -87,8 +87,8 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
@Cache(region = "registryObjects", usage = CacheConcurrencyStrategy.TRANSACTIONAL, include = "all")
public abstract class ExtensibleObjectType {
@BatchSize(size = 15)
@ManyToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
@BatchSize(size = 500)
@ManyToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
@JoinTable(inverseJoinColumns = @JoinColumn(name = "child_slot_key"))
@XmlElement(name = "Slot")
@DynamicSerializeElement

14
edexOsgi/com.raytheon.uf.common.registry.schemas.ebxml/src/oasis/names/tc/ebxml/regrep/xsd/rim/v4/RegistryObjectType.java
View file

@ -100,45 +100,45 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
RoleType.class })
@DynamicSerialize
@Entity
@Cache(region="registryObjects",usage = CacheConcurrencyStrategy.TRANSACTIONAL, include = "all")
@Cache(region = "registryObjects", usage = CacheConcurrencyStrategy.TRANSACTIONAL, include = "all")
@Inheritance(strategy = InheritanceType.TABLE_PER_CLASS)
@Table(name = "RegistryObject")
public class RegistryObjectType extends IdentifiableType {
@XmlElement(name = "Name")
@DynamicSerializeElement
@OneToOne(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
@OneToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
protected InternationalStringType name;
@XmlElement(name = "Description")
@DynamicSerializeElement
@OneToOne(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
@OneToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
protected InternationalStringType description;
@XmlElement(name = "VersionInfo")
@DynamicSerializeElement
@Cascade(value = { org.hibernate.annotations.CascadeType.DETACH })
@ManyToOne
@ManyToOne(fetch = FetchType.LAZY)
protected VersionInfoType versionInfo;
@XmlElement(name = "Classification")
@DynamicSerializeElement
@Cascade(value = { org.hibernate.annotations.CascadeType.SAVE_UPDATE,
org.hibernate.annotations.CascadeType.DETACH })
@ManyToMany
@ManyToMany(fetch = FetchType.LAZY)
protected Set<ClassificationType> classification;
@XmlElement(name = "ExternalIdentifier")
@DynamicSerializeElement
@Cascade(value = { org.hibernate.annotations.CascadeType.SAVE_UPDATE,
org.hibernate.annotations.CascadeType.DETACH })
@ManyToMany
@ManyToMany(fetch = FetchType.LAZY)
protected Set<ExternalIdentifierType> externalIdentifier;
@XmlElement(name = "ExternalLink")
@DynamicSerializeElement
@Cascade(value = { org.hibernate.annotations.CascadeType.SAVE_UPDATE,
org.hibernate.annotations.CascadeType.DETACH })
@ManyToMany
@ManyToMany(fetch = FetchType.LAZY)
protected Set<ExternalLinkType> externalLink;
@XmlAttribute

5
edexOsgi/com.raytheon.uf.common.registry.schemas.ebxml/src/oasis/names/tc/ebxml/regrep/xsd/rim/v4/SlotType.java
View file

@ -24,6 +24,7 @@ import java.io.Serializable;
import javax.persistence.CascadeType;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.ManyToOne;
@ -83,7 +84,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
// "slot_join_slot", joinColumns = @JoinColumn(name = "parent_slot_key",
// referencedColumnName = "key"), inverseJoinColumns = @JoinColumn(name =
// "child_slot_key", referencedColumnName = "key")))
@Cache(region="registryObjects",usage = CacheConcurrencyStrategy.TRANSACTIONAL, include = "all")
@Cache(region = "registryObjects", usage = CacheConcurrencyStrategy.TRANSACTIONAL, include = "all")
@Table(name = "Slot")
public class SlotType extends ExtensibleObjectType implements Serializable {
@ -94,7 +95,7 @@ public class SlotType extends ExtensibleObjectType implements Serializable {
@XmlTransient
private Integer key;
@ManyToOne(cascade = CascadeType.ALL)
@ManyToOne(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
@XmlElement(name = "SlotValue")
@DynamicSerializeElement
protected ValueType slotValue;