Commit 7ec44239 authored by bonnell's avatar bonnell

Modified GenerateJava for Atts copy constructor to utilize super's copy constructor.

Added copy constructor to AttributeSubject.java.  
Removed used of '-source 1.4' flag for java compilation. 
Fixed ViewerMethods.java @param calls to remove symbols (like >=) that the compiler complained about. Regenerated all java files.


git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@30684 18c085ea-50e0-402c-830e-de6fd14e8384
parent f517cb9f
......@@ -1090,7 +1090,6 @@ ENDIF((VISIT_PYTHON_SCRIPTING OR VISIT_PYTHON_FILTERS) AND NOT VISIT_DBIO_ONLY)
IF(VISIT_JAVA)
INCLUDE(${CMAKE_ROOT}/Modules/FindJava.cmake)
ENABLE_LANGUAGE(Java)
SET(VISIT_Java_FLAGS -source 1.4)
ENDIF(VISIT_JAVA)
CHECK_INCLUDE_FILES (fcntl.h HAVE_FCNTL_H)
......
##
## Setup VISITHOME & VISITARCH variables.
##
SET(VISITHOME /usr/gapps/visit/thirdparty_shared/2.12.0)
SET(VISITHOME /usr/gapps/visit/thirdparty_shared/2.13.0)
SET(VISITARCH linux-x86_64_gcc-4.8)
VISIT_OPTION_DEFAULT(VISIT_QT5 TRUE TYPE BOOL)
......@@ -127,8 +127,8 @@ VISIT_OPTION_DEFAULT(VISIT_GDAL_DIR ${VISITHOME}/gdal/1.10.0/${VISITARCH})
##
## H5Part
##
VISIT_OPTION_DEFAULT(VISIT_H5PART_DIR ${VISITHOME}/h5part/1.6.6/${VISITARCH})
VISIT_OPTION_DEFAULT(VISIT_H5PART_LIBDEP HDF5_LIBRARY_DIR hdf5 ${VISIT_HDF5_LIBDEP} TYPE STRING)
#VISIT_OPTION_DEFAULT(VISIT_H5PART_DIR ${VISITHOME}/h5part/1.6.6/${VISITARCH})
#VISIT_OPTION_DEFAULT(VISIT_H5PART_LIBDEP HDF5_LIBRARY_DIR hdf5 ${VISIT_HDF5_LIBDEP} TYPE STRING)
##
## HDF4
......
......@@ -92,7 +92,7 @@ public class AnimationAttributes extends AttributeSubject
public AnimationAttributes(AnimationAttributes obj)
{
super(AnimationAttributes_numAdditionalAtts);
super(obj);
animationMode = obj.animationMode;
pipelineCachingMode = obj.pipelineCachingMode;
......
......@@ -133,7 +133,7 @@ public class AnnotationAttributes extends AttributeSubject
public AnnotationAttributes(AnnotationAttributes obj)
{
super(AnnotationAttributes_numAdditionalAtts);
super(obj);
axes2D = new Axes2D(obj.axes2D);
axes3D = new Axes3D(obj.axes3D);
......
......@@ -148,7 +148,7 @@ public class AnnotationObject extends AttributeSubject
public AnnotationObject(AnnotationObject obj)
{
super(AnnotationObject_numAdditionalAtts);
super(obj);
int i;
......
......@@ -75,7 +75,7 @@ public class AnnotationObjectList extends AttributeSubject
public AnnotationObjectList(AnnotationObjectList obj)
{
super(AnnotationObjectList_numAdditionalAtts);
super(obj);
int i;
......
......@@ -94,7 +94,7 @@ public class AppearanceAttributes extends AttributeSubject
public AppearanceAttributes(AppearanceAttributes obj)
{
super(AppearanceAttributes_numAdditionalAtts);
super(obj);
useSystemDefault = obj.useSystemDefault;
background = new String(obj.background);
......
......@@ -61,13 +61,17 @@ import java.util.Vector;
// Brad Whitlock, Mon Feb 25 14:09:31 PST 2008
// Added methods to help with string conversion. Added javadoc comments.
//
// Kathleen Biagas, Fri Mar 31 13:36:59 PDT 2017
// Added a copy constructor that behaves similar to the constructor that
// takes an int.
//
// ****************************************************************************
/**
* Base class for state objects.
*
* @author Brad Whitlock
*/
public abstract class AttributeSubject extends java.lang.Object
public abstract class AttributeSubject
{
/**
* Constructor for the AttributeSubject class.
......@@ -83,6 +87,20 @@ public abstract class AttributeSubject extends java.lang.Object
attributeId = 0;
}
/**
* Copy Constructor for the AttributeSubject class.
* @param obj The attribute subject to copy.
*/
public AttributeSubject(AttributeSubject obj)
{
super();
observers = new Vector();
selected = new boolean[obj.NumAttributes()];
UnSelectAll();
attributeId = 0;
}
/**
* Registers an observer to be called when this object's Notify()
* method is called.
......
......@@ -100,7 +100,7 @@ public class Axes2D extends AttributeSubject
public Axes2D(Axes2D obj)
{
super(Axes2D_numAdditionalAtts);
super(obj);
visible = obj.visible;
autoSetTicks = obj.autoSetTicks;
......
......@@ -122,7 +122,7 @@ public class Axes3D extends AttributeSubject
public Axes3D(Axes3D obj)
{
super(Axes3D_numAdditionalAtts);
super(obj);
int i;
......
......@@ -84,7 +84,7 @@ public class AxesArray extends AttributeSubject
public AxesArray(AxesArray obj)
{
super(AxesArray_numAdditionalAtts);
super(obj);
visible = obj.visible;
ticksVisible = obj.ticksVisible;
......
......@@ -80,7 +80,7 @@ public class AxisAttributes extends AttributeSubject
public AxisAttributes(AxisAttributes obj)
{
super(AxisAttributes_numAdditionalAtts);
super(obj);
title = new AxisTitles(obj.title);
label = new AxisLabels(obj.label);
......
......@@ -78,7 +78,7 @@ public class AxisLabels extends AttributeSubject
public AxisLabels(AxisLabels obj)
{
super(AxisLabels_numAdditionalAtts);
super(obj);
visible = obj.visible;
font = new FontAttributes(obj.font);
......
......@@ -80,7 +80,7 @@ public class AxisRestrictionAttributes extends AttributeSubject
public AxisRestrictionAttributes(AxisRestrictionAttributes obj)
{
super(AxisRestrictionAttributes_numAdditionalAtts);
super(obj);
int i;
......
......@@ -82,7 +82,7 @@ public class AxisTickMarks extends AttributeSubject
public AxisTickMarks(AxisTickMarks obj)
{
super(AxisTickMarks_numAdditionalAtts);
super(obj);
visible = obj.visible;
majorMinimum = obj.majorMinimum;
......
......@@ -84,7 +84,7 @@ public class AxisTitles extends AttributeSubject
public AxisTitles(AxisTitles obj)
{
super(AxisTitles_numAdditionalAtts);
super(obj);
visible = obj.visible;
font = new FontAttributes(obj.font);
......
......@@ -86,7 +86,7 @@ public class BoxExtents extends AttributeSubject
public BoxExtents(BoxExtents obj)
{
super(BoxExtents_numAdditionalAtts);
super(obj);
int i;
......
......@@ -59,6 +59,9 @@
# 'pack' target now will create examples and docs (if not already built),
# as well as creating the jar file and the jvisit tarball for distribution.
#
# Kathleen Biagas, Fri Mar 31 12:56:33 PDT 2017
# Added TryThreshold and TryPointGlyphing examples.
#
#****************************************************************************/
PROJECT(JavaClient Java)
......@@ -243,7 +246,9 @@ PlotTypes.java
RunViewer.java
TryAnnotations.java
TryLighting.java
TryPointGlyphing.java
TryQuery.java
TryThreshold.java
)
# Some preliminary work to aid in creating the tarball
......
......@@ -79,7 +79,7 @@ public class ClientInformation extends AttributeSubject
public ClientInformation(ClientInformation obj)
{
super(ClientInformation_numAdditionalAtts);
super(obj);
int i;
......
......@@ -75,7 +75,7 @@ public class ClientInformationList extends AttributeSubject
public ClientInformationList(ClientInformationList obj)
{
super(ClientInformationList_numAdditionalAtts);
super(obj);
int i;
......
......@@ -83,7 +83,7 @@ public class ClientMethod extends AttributeSubject
public ClientMethod(ClientMethod obj)
{
super(ClientMethod_numAdditionalAtts);
super(obj);
int i;
......
......@@ -83,7 +83,7 @@ public class ColorAttribute extends AttributeSubject
public ColorAttribute(ColorAttribute obj)
{
super(ColorAttribute_numAdditionalAtts);
super(obj);
int i;
......
......@@ -75,7 +75,7 @@ public class ColorAttributeList extends AttributeSubject
public ColorAttributeList(ColorAttributeList obj)
{
super(ColorAttributeList_numAdditionalAtts);
super(obj);
int i;
......
......@@ -84,7 +84,7 @@ public class ColorControlPoint extends AttributeSubject
public ColorControlPoint(ColorControlPoint obj)
{
super(ColorControlPoint_numAdditionalAtts);
super(obj);
int i;
......
......@@ -91,7 +91,7 @@ public class ColorControlPointList extends AttributeSubject
public ColorControlPointList(ColorControlPointList obj)
{
super(ColorControlPointList_numAdditionalAtts);
super(obj);
int i;
......
......@@ -83,7 +83,7 @@ public class ColorTableAttributes extends AttributeSubject
public ColorTableAttributes(ColorTableAttributes obj)
{
super(ColorTableAttributes_numAdditionalAtts);
super(obj);
int i;
......
......@@ -80,7 +80,7 @@ public class CompactSILRestrictionAttributes extends AttributeSubject
public CompactSILRestrictionAttributes(CompactSILRestrictionAttributes obj)
{
super(CompactSILRestrictionAttributes_numAdditionalAtts);
super(obj);
int i;
......
......@@ -127,7 +127,7 @@ public class ConstructDataBinningAttributes extends AttributeSubject
public ConstructDataBinningAttributes(ConstructDataBinningAttributes obj)
{
super(ConstructDataBinningAttributes_numAdditionalAtts);
super(obj);
int i;
......
......@@ -99,7 +99,7 @@ public class ContourOpAttributes extends AttributeSubject
public ContourOpAttributes(ContourOpAttributes obj)
{
super(ContourOpAttributes_numAdditionalAtts);
super(obj);
int i;
......
......@@ -108,7 +108,7 @@ public class DBOptionsAttributes extends AttributeSubject
public DBOptionsAttributes(DBOptionsAttributes obj)
{
super(DBOptionsAttributes_numAdditionalAtts);
super(obj);
int i;
......
......@@ -88,7 +88,7 @@ public class DBPluginInfoAttributes extends AttributeSubject
public DBPluginInfoAttributes(DBPluginInfoAttributes obj)
{
super(DBPluginInfoAttributes_numAdditionalAtts);
super(obj);
int i;
......
......@@ -74,7 +74,7 @@ public class DatabaseAttributes extends AttributeSubject
public DatabaseAttributes(DatabaseAttributes obj)
{
super(DatabaseAttributes_numAdditionalAtts);
super(obj);
state = obj.state;
......
......@@ -103,7 +103,7 @@ public class DatabaseCorrelation extends AttributeSubject
public DatabaseCorrelation(DatabaseCorrelation obj)
{
super(DatabaseCorrelation_numAdditionalAtts);
super(obj);
int i;
......
......@@ -87,7 +87,7 @@ public class DatabaseCorrelationList extends AttributeSubject
public DatabaseCorrelationList(DatabaseCorrelationList obj)
{
super(DatabaseCorrelationList_numAdditionalAtts);
super(obj);
int i;
......
......@@ -79,7 +79,7 @@ public class EngineList extends AttributeSubject
public EngineList(EngineList obj)
{
super(EngineList_numAdditionalAtts);
super(obj);
int i;
......
......@@ -82,7 +82,7 @@ public class EngineProperties extends AttributeSubject
public EngineProperties(EngineProperties obj)
{
super(EngineProperties_numAdditionalAtts);
super(obj);
numNodes = obj.numNodes;
numProcessors = obj.numProcessors;
......
......@@ -93,7 +93,7 @@ public class ExportDBAttributes extends AttributeSubject
public ExportDBAttributes(ExportDBAttributes obj)
{
super(ExportDBAttributes_numAdditionalAtts);
super(obj);
int i;
......
......@@ -105,7 +105,7 @@ public class Expression extends AttributeSubject
public Expression(Expression obj)
{
super(Expression_numAdditionalAtts);
super(obj);
name = new String(obj.name);
definition = new String(obj.definition);
......
......@@ -75,7 +75,7 @@ public class ExpressionList extends AttributeSubject
public ExpressionList(ExpressionList obj)
{
super(ExpressionList_numAdditionalAtts);
super(obj);
int i;
......
......@@ -86,7 +86,7 @@ public class FileOpenOptions extends AttributeSubject
public FileOpenOptions(FileOpenOptions obj)
{
super(FileOpenOptions_numAdditionalAtts);
super(obj);
int i;
......
......@@ -90,7 +90,7 @@ public class FontAttributes extends AttributeSubject
public FontAttributes(FontAttributes obj)
{
super(FontAttributes_numAdditionalAtts);
super(obj);
font = obj.font;
scale = obj.scale;
......
......@@ -82,7 +82,7 @@ public class GaussianControlPoint extends AttributeSubject
public GaussianControlPoint(GaussianControlPoint obj)
{
super(GaussianControlPoint_numAdditionalAtts);
super(obj);
x = obj.x;
height = obj.height;
......
......@@ -75,7 +75,7 @@ public class GaussianControlPointList extends AttributeSubject
public GaussianControlPointList(GaussianControlPointList obj)
{
super(GaussianControlPointList_numAdditionalAtts);
super(obj);
int i;
......
......@@ -140,7 +140,7 @@ public class GlobalAttributes extends AttributeSubject
public GlobalAttributes(GlobalAttributes obj)
{
super(GlobalAttributes_numAdditionalAtts);
super(obj);
int i;
......
......@@ -98,7 +98,7 @@ public class GlobalLineoutAttributes extends AttributeSubject
public GlobalLineoutAttributes(GlobalLineoutAttributes obj)
{
super(GlobalLineoutAttributes_numAdditionalAtts);
super(obj);
Dynamic = obj.Dynamic;
createWindow = obj.createWindow;
......
......@@ -75,7 +75,7 @@ public class HostProfileList extends AttributeSubject
public HostProfileList(HostProfileList obj)
{
super(HostProfileList_numAdditionalAtts);
super(obj);
int i;
......
......@@ -94,7 +94,7 @@ public class InteractorAttributes extends AttributeSubject
public InteractorAttributes(InteractorAttributes obj)
{
super(InteractorAttributes_numAdditionalAtts);
super(obj);
showGuidelines = obj.showGuidelines;
clampSquare = obj.clampSquare;
......
......@@ -108,7 +108,7 @@ public class InternalResampleAttributes extends AttributeSubject
public InternalResampleAttributes(InternalResampleAttributes obj)
{
super(InternalResampleAttributes_numAdditionalAtts);
super(obj);
useTargetVal = obj.useTargetVal;
targetVal = obj.targetVal;
......
......@@ -78,7 +78,7 @@ public class KeyframeAttributes extends AttributeSubject
public KeyframeAttributes(KeyframeAttributes obj)
{
super(KeyframeAttributes_numAdditionalAtts);
super(obj);
enabled = obj.enabled;
nFrames = obj.nFrames;
......
......@@ -150,7 +150,7 @@ public class LaunchProfile extends AttributeSubject
public LaunchProfile(LaunchProfile obj)
{
super(LaunchProfile_numAdditionalAtts);
super(obj);
int i;
......
......@@ -96,7 +96,7 @@ public class LightAttributes extends AttributeSubject
public LightAttributes(LightAttributes obj)
{
super(LightAttributes_numAdditionalAtts);
super(obj);
int i;
......
......@@ -90,7 +90,7 @@ public class LightList extends AttributeSubject
public LightList(LightList obj)
{
super(LightList_numAdditionalAtts);
super(obj);
light0 = new LightAttributes(obj.light0);
light1 = new LightAttributes(obj.light1);
......
......@@ -106,7 +106,7 @@ public class Line extends AttributeSubject
public Line(Line obj)
{
super(Line_numAdditionalAtts);
super(obj);
int i;
......
......@@ -108,7 +108,7 @@ public class LinearTransformAttributes extends AttributeSubject
public LinearTransformAttributes(LinearTransformAttributes obj)
{
super(LinearTransformAttributes_numAdditionalAtts);
super(obj);
m00 = obj.m00;
m01 = obj.m01;
......
......@@ -125,7 +125,7 @@ public class MachineProfile extends AttributeSubject
public MachineProfile(MachineProfile obj)
{
super(MachineProfile_numAdditionalAtts);
super(obj);
int i;
......
......@@ -104,7 +104,7 @@ public class MaterialAttributes extends AttributeSubject
public MaterialAttributes(MaterialAttributes obj)
{
super(MaterialAttributes_numAdditionalAtts);
super(obj);
smoothing = obj.smoothing;
forceMIR = obj.forceMIR;
......
......@@ -100,7 +100,7 @@ public class MeshManagementAttributes extends AttributeSubject
public MeshManagementAttributes(MeshManagementAttributes obj)
{
super(MeshManagementAttributes_numAdditionalAtts);
super(obj);
int i;
......
......@@ -90,7 +90,7 @@ public class MessageAttributes extends AttributeSubject
public MessageAttributes(MessageAttributes obj)
{
super(MessageAttributes_numAdditionalAtts);
super(obj);
int i;
......
......@@ -123,7 +123,7 @@ public class MovieAttributes extends AttributeSubject
public MovieAttributes(MovieAttributes obj)
{
super(MovieAttributes_numAdditionalAtts);
super(obj);
int i;
......
......@@ -88,7 +88,7 @@ public class NameschemeAttributes extends AttributeSubject
public NameschemeAttributes(NameschemeAttributes obj)
{
super(NameschemeAttributes_numAdditionalAtts);
super(obj);
int i;
......
......@@ -82,7 +82,7 @@ public class NamespaceAttributes extends AttributeSubject
public NamespaceAttributes(NamespaceAttributes obj)
{
super(NamespaceAttributes_numAdditionalAtts);
super(obj);
int i;
......