Skip to content

P
proview
Commit 510dc20b authored by claes's avatar claes
Browse files
Options

Revering to 1.4 Vector style

parent a233ecb0
Show whitespace changes
Inline Side-by-side
Showing with 148 additions and 81 deletions
java/jpwr/jop/src/FlowArray.java
View file @ 510dc20b
/*
* Proview $Id: FlowArray.java,v 1.3 2006-06-14 10:41:53 claes Exp $
* Proview $Id: FlowArray.java,v 1.4 2006-06-16 05:09:38 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB.
*
* This program is free software; you can redistribute it and/or
......@@ -27,7 +27,8 @@ import javax.swing.*;
public class FlowArray {
Vector<Object> a = new Vector<Object>();
//Vector<Object> a = new Vector<Object>();
Vector a = new Vector();
FlowCmn cmn;
public FlowArray( FlowCmn cmn) {
......
java/jpwr/jop/src/FlowCmn.java
View file @ 510dc20b
/*
* Proview $Id: FlowCmn.java,v 1.3 2006-06-14 10:41:53 claes Exp $
* Proview $Id: FlowCmn.java,v 1.4 2006-06-16 05:09:38 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB.
*
* This program is free software; you can redistribute it and/or
......@@ -39,9 +39,12 @@ public class FlowCmn {
double y_high;
double y_low;
Vector<Object> a = new Vector<Object>();
Vector<Object> a_nc = new Vector<Object>();
Vector<Object> a_cc = new Vector<Object>();
//Vector<Object> a = new Vector<Object>();
Vector a = new Vector();
//Vector<Object> a_nc = new Vector<Object>();
Vector a_nc = new Vector();
//Vector<Object> a_cc = new Vector<Object>();
Vector a_cc = new Vector();
public FlowCmn( Object ctx, Gdh gdh, JopSession session) {
this.ctx = ctx;
......
java/jpwr/jop/src/FlowVector.java
View file @ 510dc20b
/*
* Proview $Id: FlowVector.java,v 1.3 2006-06-14 10:41:53 claes Exp $
* Proview $Id: FlowVector.java,v 1.4 2006-06-16 05:09:38 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB.
*
* This program is free software; you can redistribute it and/or
......@@ -27,7 +27,8 @@ public class FlowVector {
public FlowVector() {
}
public static void open( BufferedReader reader, FlowCmn cmn, Vector<Object> a) {
//public static void open( BufferedReader reader, FlowCmn cmn, Vector<Object> a) {
public static void open( BufferedReader reader, FlowCmn cmn, Vector a) {
String line;
StringTokenizer token;
boolean end = false;
......
java/jpwr/jop/src/HistStatModel1.java
View file @ 510dc20b
/*
* Proview $Id: HistStatModel1.java,v 1.3 2006-06-14 10:41:53 claes Exp $
* Proview $Id: HistStatModel1.java,v 1.4 2006-06-16 05:09:38 claes Exp $
* Copyright (C) 2005 SSAB Oxelösund AB.
*
* This program is free software; you can redistribute it and/or
......@@ -27,7 +27,8 @@ import jpwr.rt.*;
public class HistStatModel1 extends AbstractTableModel{
// The List storing the resulting statistics.
public List<MhrEvent> result;
//public List<MhrEvent> result;
public List result;
private String[][] freqNames={{"Object", "Nr. of alarms" },{"Objekt","Antal larm"}};
int lang;
......@@ -39,7 +40,8 @@ public class HistStatModel1 extends AbstractTableModel{
}
public void clearData(){
result = new ArrayList<MhrEvent>();
//result = new ArrayList<MhrEvent>();
result = new ArrayList();
}
public void setData(MhData m){
......@@ -92,11 +94,16 @@ public class HistStatModel1 extends AbstractTableModel{
public void sortData(){
//sortData sorts the result List. Largest number of times found first.
Collections.sort(result, new Comparator<MhrEvent>(){
public int compare(MhrEvent o1, MhrEvent o2){
if (o1.eventFlags < o2.eventFlags)
//Collections.sort(result, new Comparator<MhrEvent>(){
// public int compare(MhrEvent o1, MhrEvent o2){
// if (o1.eventFlags < o2.eventFlags)
// return 1;
// else if (o1.eventFlags > o2.eventFlags)
Collections.sort(result, new Comparator(){
public int compare(Object o1, Object o2){
if (((MhrEvent)o1).eventFlags < ((MhrEvent)o2).eventFlags)
return 1;
else if (o1.eventFlags > o2.eventFlags)
else if (((MhrEvent)o1).eventFlags > ((MhrEvent)o2).eventFlags)
return -1;
else return 0;
}
......
java/jpwr/jop/src/HistStatModel2.java
View file @ 510dc20b
/*
* Proview $Id: HistStatModel2.java,v 1.4 2006-06-14 10:41:53 claes Exp $
* Proview $Id: HistStatModel2.java,v 1.5 2006-06-16 05:09:38 claes Exp $
* Copyright (C) 2005 SSAB Oxelösund AB.
*
* This program is free software; you can redistribute it and/or
......@@ -29,7 +29,8 @@ import jpwr.rt.*;
public class HistStatModel2 extends AbstractTableModel{
// The List holding the statistics
List<MhrEvent> result;
//List<MhrEvent> result;
List result;
private String[][] names={{"Object", "Duration time" },{"Objekt", "Varaktighet"}};
int lang;
......@@ -42,7 +43,8 @@ public class HistStatModel2 extends AbstractTableModel{
}
public void clearData(){
result = new ArrayList<MhrEvent>();
//result = new ArrayList<MhrEvent>();
result = new ArrayList();
}
public void setData(MhData m){
......@@ -158,10 +160,14 @@ public class HistStatModel2 extends AbstractTableModel{
//eventFlags).Longest duration on top.)
public void sortData(){
Collections.sort(result, new Comparator<MhrEvent>(){
public int compare(MhrEvent o1, MhrEvent o2){
if (o1.eventFlags < o2.eventFlags) return 1;
else if (o1.eventFlags > o2.eventFlags) return -1;
//Collections.sort(result, new Comparator<MhrEvent>(){
// public int compare(MhrEvent o1, MhrEvent o2){
// if (o1.eventFlags < o2.eventFlags) return 1;
// else if (o1.eventFlags > o2.eventFlags) return -1;
Collections.sort(result, new Comparator(){
public int compare(Object o1, Object o2){
if (((MhrEvent)o1).eventFlags < ((MhrEvent)o2).eventFlags) return 1;
else if (((MhrEvent)o1).eventFlags > ((MhrEvent)o2).eventFlags) return -1;
else return 0;
}
});
......
java/jpwr/jop/src/JopEngine.java
View file @ 510dc20b
/*
* Proview $Id: JopEngine.java,v 1.4 2006-06-14 10:41:53 claes Exp $
* Proview $Id: JopEngine.java,v 1.5 2006-06-16 05:09:38 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB.
*
* This program is free software; you can redistribute it and/or
......@@ -35,7 +35,8 @@ import jpwr.rt.*;
public class JopEngine implements ActionListener {
int scanTime;
int animationScanTime;
Vector<Object> updateVector;
//Vector<Object> updateVector;
Vector updateVector;
Timer timer;
public Gdh gdh;
public LocalDb ldb = null;
......@@ -52,7 +53,8 @@ public class JopEngine implements ActionListener {
public JopEngine( int scantime, Object root) {
scanTime = scantime;
animationScanTime = scantime;
updateVector = new Vector<Object>( 50, 50);
//updateVector = new Vector<Object>( 50, 50);
updateVector = new Vector( 50, 50);
timer = new Timer( scantime, this);
timer.start();
gdh = new Gdh( root);
......
java/jpwr/jop/src/JopSessionRep.java
View file @ 510dc20b
/*
* Proview $Id: JopSessionRep.java,v 1.8 2006-06-14 10:41:53 claes Exp $
* Proview $Id: JopSessionRep.java,v 1.9 2006-06-16 05:09:38 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB.
*
* This program is free software; you can redistribute it and/or
......@@ -31,7 +31,8 @@ public class JopSessionRep implements JopSessionIfc {
XttTree navigator;
MhFrame alarmList;
JopLoginFrame login;
Vector<Object> frames = new Vector<Object>();
//Vector<Object> frames = new Vector<Object>();
Vector frames = new Vector();
public JopSessionRep() {
}
......
java/jpwr/jop/src/LocalDb.java
View file @ 510dc20b
/*
* Proview $Id: LocalDb.java,v 1.3 2006-06-14 05:07:48 claes Exp $
* Proview $Id: LocalDb.java,v 1.4 2006-06-16 05:11:42 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB.
*
* This program is free software; you can redistribute it and/or
......@@ -62,7 +62,8 @@ public class LocalDb {
}
}
Vector<LocalSub> subscriptions = new Vector<LocalSub>();
//Vector<LocalSub> subscriptions = new Vector<LocalSub>();
Vector subscriptions = new Vector();
int subscriptionCount = 1;
public LocalDb() {
......
java/jpwr/jop/src/MhTable.java
View file @ 510dc20b
/*
* Proview $Id: MhTable.java,v 1.4 2006-06-14 10:41:53 claes Exp $
* Proview $Id: MhTable.java,v 1.5 2006-06-16 05:09:38 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB.
*
* This program is free software; you can redistribute it and/or
......@@ -931,13 +931,15 @@ public class MhTable extends JPanel
int nrOfAlarms = in.readInt();
if(nrOfAlarms > 0)
{
mhData.alarmVec = (Vector<MhrEvent>)in.readObject();
//mhData.alarmVec = (Vector<MhrEvent>)in.readObject();
mhData.alarmVec = (Vector)in.readObject();
((AlarmTableModel)alarmTable.getModel()).updateTable();
}
int nrOfEvents = in.readInt();
if(nrOfEvents > 0)
{
mhData.eventVec = (Vector<MhrEvent>)in.readObject();
//mhData.eventVec = (Vector<MhrEvent>)in.readObject();
mhData.eventVec = (Vector)in.readObject();
((EventTableModel)eventTable.getModel()).updateTable();
}
}
......
java/jpwr/jop/src/RatioLayout.java
View file @ 510dc20b
/*
* Proview $Id: RatioLayout.java,v 1.4 2006-06-14 10:41:53 claes Exp $
* Proview $Id: RatioLayout.java,v 1.5 2006-06-16 05:09:38 claes Exp $
* Copyright (C) 2005 SSAB Oxelösund AB.
*
* This program is free software; you can redistribute it and/or
......@@ -40,10 +40,12 @@ import java.beans.Beans;
public class RatioLayout implements LayoutManager2 {
// track the ratios for each object of form "xratio,yratio;wratio,hratio"
Vector<Proportion> ratios = new Vector<Proportion>(1);
//Vector<Proportion> ratios = new Vector<Proportion>(1);
Vector ratios = new Vector(1);
// track the components also so we can remove associated modifier
// if necessary.
Vector<Component> components = new Vector<Component>(1);
//Vector<Component> components = new Vector<Component>(1);
Vector components = new Vector(1);
public void addLayoutComponent(String r, Component comp) {
}
......@@ -72,8 +74,10 @@ public class RatioLayout implements LayoutManager2 {
}
//Reset the Layout
public void invalidateLayout(Container target){
ratios = new Vector<Proportion>(1);
components = new Vector<Component>(1);
//ratios = new Vector<Proportion>(1);
//components = new Vector<Component>(1);
ratios = new Vector(1);
components = new Vector(1);
}
......
java/jpwr/jop/src/XttObj.java
View file @ 510dc20b
/*
* Proview $Id: XttObj.java,v 1.4 2006-06-14 10:41:53 claes Exp $
* Proview $Id: XttObj.java,v 1.5 2006-06-16 05:09:38 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB.
*
* This program is free software; you can redistribute it and/or
......@@ -174,7 +174,8 @@ public class XttObj extends DynamicObj implements JopDynamic
XttObjAttr obj;
String suffix;
GdhrRefObjectInfo ret;
Vector<String> refVec = new Vector<String>();
//Vector<String> refVec = new Vector<String>();
Vector refVec = new Vector();
for(int i = 0; i < attrVector.size(); i++)
{
obj = ((XttObjAttr)attrVector.get(i));
......
java/jpwr/jop/src/XttTree.java
View file @ 510dc20b
/*
* Proview $Id: XttTree.java,v 1.10 2006-06-14 10:41:53 claes Exp $
* Proview $Id: XttTree.java,v 1.11 2006-06-16 05:09:38 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB.
*
* This program is free software; you can redistribute it and/or
......@@ -377,9 +377,11 @@ public class XttTree extends JPanel
return;
}
//anvnds utifall anvndaren angett debug
Vector<String> ref_vec = new Vector<String>();
//Vector<String> ref_vec = new Vector<String>();
Vector ref_vec = new Vector();
//anvnds utifall anvndaren angett debug
Vector<XttRefObj> o_vec = new Vector<XttRefObj>();
//Vector<XttRefObj> o_vec = new Vector<XttRefObj>();
Vector o_vec = new Vector();
//loopa igenom resultat-vektorn
for(int i = 0; i < v.size(); i++)
......@@ -513,7 +515,8 @@ public class XttTree extends JPanel
Logg.logg("XttTree: Vector == null efter getAllClassAttributes", 4);
return;
}
Vector<XttObjAttr> xttObjAttrVec = new Vector<XttObjAttr>();
//Vector<XttObjAttr> xttObjAttrVec = new Vector<XttObjAttr>();
Vector xttObjAttrVec = new Vector();
for(int i = 0; i < v.size(); i++)
{
......@@ -822,7 +825,8 @@ public class XttTree extends JPanel
//what we are looking for
TreePath selectedPath = this.tree.getSelectionPath();
Vector<String> pathVec = createPathVec(objectName);
//Vector<String> pathVec = createPathVec(objectName);
Vector pathVec = createPathVec(objectName);
int ret = 1;
DefaultMutableTreeNode tn = this.rootNode;
TreePath tp;
......@@ -839,9 +843,11 @@ public class XttTree extends JPanel
}
}
//public Vector createPathVec(String name)
public Vector<String> createPathVec(String name)
{
Vector<String> pathVec = new Vector<String>();
//Vector<String> pathVec = new Vector<String>();
Vector pathVec = new Vector();
int strIndex;
int i = 0;
strIndex = name.indexOf('-');
......@@ -956,7 +962,8 @@ public class XttTree extends JPanel
XttObj obj = ((XttObj)tn.getUserObject());
if(obj.debug)
{
Vector<PwrtRefId> unref_vec = new Vector<PwrtRefId>();
//Vector<PwrtRefId> unref_vec = new Vector<PwrtRefId>();
Vector unref_vec = new Vector();
obj.debug = false;
Enumeration enm = tn.children();
while(enm.hasMoreElements())
......@@ -1693,9 +1700,11 @@ public class XttTree extends JPanel
tn.remove(tc);
GdhrRefObjectInfo ret;
XttObjAttr obj = (XttObjAttr)tn.getUserObject();
Vector<String> ref_vec = new Vector<String>();
//Vector<String> ref_vec = new Vector<String>();
Vector ref_vec = new Vector();
Vector ret_vec;
Vector<XttArrayAttr> attr_vec = new Vector<XttArrayAttr>();
//Vector<XttArrayAttr> attr_vec = new Vector<XttArrayAttr>();
Vector attr_vec = new Vector();
//qqq borde lggas i egen trd???
for(int j = 0; j < obj.elements; j++)
{
......
java/jpwr/rt/src/Gdh.java
View file @ 510dc20b
/*
* Proview $Id: Gdh.java,v 1.8 2006-06-14 10:41:53 claes Exp $
* Proview $Id: Gdh.java,v 1.9 2006-06-16 05:09:38 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB.
*
* This program is free software; you can redistribute it and/or
......@@ -130,7 +130,8 @@ public class Gdh {
return false;
}
public Vector<CdhrObjAttr> getAllClassAttributes( int classid, PwrtObjid objid_obj )
public Vector getAllClassAttributes( int classid, PwrtObjid objid_obj )
//public Vector<CdhrObjAttr> getAllClassAttributes( int classid, PwrtObjid objid_obj )
{
//System.out.println("getAllClassAttributes" + classid + " " + objid_obj.oix + " " + objid_obj.vid);
//CdhrObjid co = this.classIdToObjid(classid);
......@@ -142,7 +143,8 @@ public class Gdh {
GdhrsAttrDef[] gdhrsAttrDefArr = this.getObjectBodyDef(classid, objid_obj);
Vector<CdhrObjAttr> v = new Vector<CdhrObjAttr>();
//Vector<CdhrObjAttr> v = new Vector<CdhrObjAttr>();
Vector v = new Vector();
for(int i = 0;i<gdhrsAttrDefArr.length;i++)
{
if(gdhrsAttrDefArr[i] == null)
......@@ -176,7 +178,8 @@ public class Gdh {
return v;
}
public Vector<CdhrObjAttr> getAllClassAttributes( String name )
//public Vector<CdhrObjAttr> getAllClassAttributes( String name )
public Vector getAllClassAttributes( String name )
{
System.out.println("getAllClassAttributes" + name);
......@@ -191,7 +194,8 @@ public class Gdh {
return this.getAllClassAttributes(this.getObjectClass(this.nameToObjid(name).objid).classId, this.nameToObjid(name).objid );
}
Vector<CdhrObjAttr> v = new Vector<CdhrObjAttr>();
//Vector<CdhrObjAttr> v = new Vector<CdhrObjAttr>();
Vector v = new Vector();
for(int i = 0;i<gdhrsAttrDefArr.length;i++)
{
if(gdhrsAttrDefArr[i] == null)
......@@ -229,10 +233,12 @@ public class Gdh {
public Vector<CdhrObjid> getAllSiblings( PwrtObjid objid )
//public Vector<CdhrObjid> getAllSiblings( PwrtObjid objid )
public Vector getAllSiblings( PwrtObjid objid )
{
CdhrObjid sibling = (CdhrObjid)this.getNextSibling(objid);
Vector<CdhrObjid> v = new Vector<CdhrObjid>();
//Vector<CdhrObjid> v = new Vector<CdhrObjid>();
Vector v = new Vector();
while(sibling.oddSts())
{
v.add(sibling);
......@@ -241,7 +247,8 @@ public class Gdh {
return v;
}
public Vector<GdhrGetXttObj> getAllXttSiblings( PwrtObjid objid )
//public Vector<GdhrGetXttObj> getAllXttSiblings( PwrtObjid objid )
public Vector getAllXttSiblings( PwrtObjid objid )
{
String name = null;
String fullName = null;
......@@ -251,7 +258,8 @@ public class Gdh {
CdhrClassId cdhrClassId;
int sts = 2;
boolean hasChildren = false;
Vector<GdhrGetXttObj> v = new Vector<GdhrGetXttObj>();
//Vector<GdhrGetXttObj> v = new Vector<GdhrGetXttObj>();
Vector v = new Vector();
CdhrObjid classObj;
......@@ -294,7 +302,8 @@ public class Gdh {
}
return v;
}
public Vector<GdhrGetXttObj> getAllXttChildren( PwrtObjid objid )
//public Vector<GdhrGetXttObj> getAllXttChildren( PwrtObjid objid )
public Vector getAllXttChildren( PwrtObjid objid )
{
String name = null;
String fullName = null;
......@@ -304,7 +313,8 @@ public class Gdh {
CdhrClassId cdhrClassId;
int sts = 2;
boolean hasChildren = false;
Vector<GdhrGetXttObj> v = new Vector<GdhrGetXttObj>();
//Vector<GdhrGetXttObj> v = new Vector<GdhrGetXttObj>();
Vector v = new Vector();
CdhrObjid classObj;
System.out.println("getAllXttChildren");
......@@ -350,9 +360,11 @@ public class Gdh {
return v;
}
public Vector<GdhrRefObjectInfo> refObjectInfo_Vector( Vector vec )
//public Vector<GdhrRefObjectInfo> refObjectInfo_Vector( Vector vec )
public Vector refObjectInfo_Vector( Vector vec )
{
Vector<GdhrRefObjectInfo> retVec = new Vector<GdhrRefObjectInfo>();
//Vector<GdhrRefObjectInfo> retVec = new Vector<GdhrRefObjectInfo>();
Vector retVec = new Vector();
for(int i = 0;i < vec.size();i++)
{
//System.out.println("refObjectInfo_vector: " + (String)vec.get(i));
......
java/jpwr/rt/src/GdhServer.java
View file @ 510dc20b
/*
* Proview $Id: GdhServer.java,v 1.14 2006-06-14 10:41:53 claes Exp $
* Proview $Id: GdhServer.java,v 1.15 2006-06-16 05:09:38 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB.
*
* This program is free software; you can redistribute it and/or
......@@ -98,7 +98,8 @@ public class GdhServer
public final static int __IO_EXCEPTION = 2000;
public final static int __UNREFED = 0;
static ArrayList<SubElement> subscriptions = new ArrayList<SubElement>();
//static ArrayList<SubElement> subscriptions = new ArrayList<SubElement>();
static ArrayList subscriptions = new ArrayList();
static int subscriptionCount = 0;
......@@ -331,7 +332,8 @@ public class GdhServer
private class GdhThread extends Thread
{
Socket clientSocket;
public Vector<Sub> thSub = new Vector<Sub>();
//public Vector<Sub> thSub = new Vector<Sub>();
public Vector thSub = new Vector();
int maxConnections;
int threadNumber;
......@@ -634,7 +636,8 @@ public class GdhServer
break;
}
String attrName;
Vector<Sub> gdhRet = new Vector<Sub>(vec.size());
//Vector<Sub> gdhRet = new Vector<Sub>(vec.size());
Vector gdhRet = new Vector(vec.size());
for(int j = 0; j < vec.size(); j++)
{
attrName = (String)vec.get(j);
......@@ -1497,7 +1500,8 @@ public class GdhServer
try
{
String name = in.readUTF();
Vector<CdhrObjAttr> v = gdh.getAllClassAttributes(name);
//Vector<CdhrObjAttr> v = gdh.getAllClassAttributes(name);
Vector v = gdh.getAllClassAttributes(name);
out.writeObject(v);
out.flush();
}
......@@ -1511,7 +1515,8 @@ public class GdhServer
{
PwrtObjid objid = (PwrtObjid)in.readObject();
CdhrObjid sibling = (CdhrObjid)gdh.getNextSibling(objid);
Vector<CdhrObjid> v = new Vector<CdhrObjid>();
//Vector<CdhrObjid> v = new Vector<CdhrObjid>();
Vector v = new Vector();
while(sibling.oddSts())
{
v.add(sibling);
......@@ -1542,7 +1547,8 @@ public class GdhServer
CdhrClassId cdhrClassId;
int sts = 2;
boolean hasChildren = false;
Vector<GdhrGetXttObj> v = new Vector<GdhrGetXttObj>();
//Vector<GdhrGetXttObj> v = new Vector<GdhrGetXttObj>();
Vector v = new Vector();
CdhrObjid classObj;
cdhrObjId = (CdhrObjid)gdh.getNextSibling(objid);
......@@ -1610,7 +1616,8 @@ public class GdhServer
CdhrClassId cdhrClassId;
int sts = 2;
boolean hasChildren = false;
Vector<GdhrGetXttObj> v = new Vector<GdhrGetXttObj>();
//Vector<GdhrGetXttObj> v = new Vector<GdhrGetXttObj>();
Vector v = new Vector();
CdhrObjid classObj;
......
java/jpwr/rt/src/MhData.java
View file @ 510dc20b
/*
* Proview $Id: MhData.java,v 1.4 2006-06-14 10:41:53 claes Exp $
* Proview $Id: MhData.java,v 1.5 2006-06-16 05:09:38 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB.
*
* This program is free software; you can redistribute it and/or
......@@ -31,16 +31,20 @@ public class MhData
public int maxNrOfAlarms;
public int maxNrOfEvents;
public Vector<MhrEvent> alarmVec;
public Vector<MhrEvent> eventVec;
//public Vector<MhrEvent> alarmVec;
public Vector alarmVec;
//public Vector<MhrEvent> eventVec;
public Vector eventVec;
public MhData(int maxNrOfAlarms, int maxNrOfEvents)
{
this.maxNrOfAlarms = maxNrOfAlarms;
this.maxNrOfEvents = maxNrOfEvents;
this.alarmVec = new Vector<MhrEvent>(maxNrOfAlarms);
this.eventVec = new Vector<MhrEvent>(maxNrOfEvents);
//this.alarmVec = new Vector<MhrEvent>(maxNrOfAlarms);
this.alarmVec = new Vector(maxNrOfAlarms);
//this.eventVec = new Vector<MhrEvent>(maxNrOfEvents);
this.eventVec = new Vector(maxNrOfEvents);
}
public int getNrOfAlarms()
{
......@@ -58,9 +62,11 @@ public class MhData
{
return (MhrEvent)eventVec.get(i);
}
public void addMessToVectorInSortedOrder(Vector<MhrEvent> v, MhrEvent ev)
//public void addMessToVectorInSortedOrder(Vector<MhrEvent> v, MhrEvent ev)
public void addMessToVectorInSortedOrder(Vector v, MhrEvent ev)
{
ListIterator<MhrEvent> iter = v.listIterator();
//ListIterator<MhrEvent> iter = v.listIterator();
ListIterator iter = v.listIterator();
MhrEvent vEv;
while(iter.hasNext())
{
......
java/jpwr/rt_client/src/Gdh.java
View file @ 510dc20b
/*
* Proview $Id: Gdh.java,v 1.10 2006-06-14 10:41:53 claes Exp $
* Proview $Id: Gdh.java,v 1.11 2006-06-16 05:09:38 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB.
*
* This program is free software; you can redistribute it and/or
......@@ -96,7 +96,8 @@ public class Gdh
Socket gdhSocket;
ObjectOutputStream out;
ObjectInputStream in;
Vector<Sub> subscriptions = new Vector<Sub>();
//Vector<Sub> subscriptions = new Vector<Sub>();
Vector subscriptions = new Vector();
int subscriptionCount = 0;
boolean listSent = false;
int subLate = 0;
......@@ -560,7 +561,8 @@ public class Gdh
out.writeObject(vec);
out.flush();
Vector<GdhrRefObjectInfo> retVec = (Vector<GdhrRefObjectInfo>)in.readObject();
//Vector<GdhrRefObjectInfo> retVec = (Vector<GdhrRefObjectInfo>)in.readObject();
Vector retVec = (Vector)in.readObject();
if(retVec == null)
{
locked = false;
......@@ -590,7 +592,8 @@ public class Gdh
System.out.println("REF_OBJECT_INFO_VECTOR: IO_Exception");
locked = false;
notify();
Vector<GdhrRefObjectInfo> retVec = new Vector<GdhrRefObjectInfo>();
//Vector<GdhrRefObjectInfo> retVec = new Vector<GdhrRefObjectInfo>();
Vector retVec = new Vector();
retVec.add(new GdhrRefObjectInfo(null, 0, __IO_EXCEPTION, 0));
return retVec;
}
......@@ -861,7 +864,8 @@ public class Gdh
out.writeInt(refid.nid);
}
out.flush();
Vector<PwrtStatus> ret_vec = new Vector<PwrtStatus>();
//Vector<PwrtStatus> ret_vec = new Vector<PwrtStatus>();
Vector ret_vec = new Vector();
//System.out.println("unrefObjectInfo_VEctor i: " + i);
while(i > 0)
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7