TImourka/PIbd-21_Kouvshinoff_T._A._WarmlyLocomotive._Harder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: TImourka:b96bc6dcad534d7d28cdb9cff869dfdc7c1d643c
Branches Tags
TImourka:main
TImourka:laba6
TImourka:laba5
TImourka:laba4
TImourka:laba3
TImourka:laba2
TImourka:laba1
..
compare: TImourka:a6d1695a31c5c51cae73127004973ca5a30fd345
Branches Tags
TImourka:laba6
TImourka:laba5
TImourka:laba4
TImourka:laba3
TImourka:laba2
TImourka:laba1
TImourka:main

2 Commits
b96bc6dcad ... a6d1695a31

Author SHA1 Message Date
TImourka
a6d1695a31 Merge pull request 'поменял на эрэйЛист' (#5) from laba3 into laba4 
Reviewed-on: http://student.git.athene.tech/TImourka/PIbd-21_Kouvshinoff_T._A._WarmlyLocomotive._Harder/pulls/5
 2023-10-24 13:19:29 +04:00
Timourka
c4403447c7 поменял на эрэйЛист 2023-10-24 12:10:39 +04:00
1 changed files with 10 additions and 9 deletions
Show Stats Expand all files Collapse all files

19
laba1Loco/GenericDopClass.java
View File

@ -1,11 +1,12 @@
package laba1Loco; package laba1Loco;
import java.util.ArrayList;
import java.util.Random; import java.util.Random;
public class GenericDopClass<T extends EntityTrain, U extends IWheelDrawing> { public class GenericDopClass<T extends EntityTrain, U extends IWheelDrawing> {
private Object[] Trains; private ArrayList<T> Trains;
private Object[] Wheels; private ArrayList<U> Wheels;
private int maxCountTrains; private int maxCountTrains;
private int countTrains; private int countTrains;
private int maxCountWheels; private int maxCountWheels;
@ -23,8 +24,8 @@ public class GenericDopClass<T extends EntityTrain, U extends IWheelDrawing> {
public GenericDopClass(int _maxCountTrains, int _maxCountWheels, int pictureWidth, int pictureHeight){ public GenericDopClass(int _maxCountTrains, int _maxCountWheels, int pictureWidth, int pictureHeight){
maxCountTrains = _maxCountTrains; maxCountTrains = _maxCountTrains;
maxCountWheels = _maxCountWheels; maxCountWheels = _maxCountWheels;
Trains = new Object[maxCountTrains]; Trains = new ArrayList<T>(maxCountTrains);
Wheels = new Object[maxCountWheels]; Wheels = new ArrayList<U>(maxCountWheels);
countTrains = 0; countTrains = 0;
countWheels = 0; countWheels = 0;
_pictureWidth = pictureWidth; _pictureWidth = pictureWidth;
@ -37,7 +38,7 @@ public class GenericDopClass<T extends EntityTrain, U extends IWheelDrawing> {
return false; return false;
if (countTrains > maxCountTrains) if (countTrains > maxCountTrains)
return false; return false;
Trains[countTrains++] = train; Trains.add(countTrains++, train);
return true; return true;
} }
@ -46,7 +47,7 @@ public class GenericDopClass<T extends EntityTrain, U extends IWheelDrawing> {
return false; return false;
if (countWheels > maxCountWheels) if (countWheels > maxCountWheels)
return false; return false;
Wheels[countWheels++] = wheel; Wheels.add(countWheels++, wheel);
return true; return true;
} }
@ -56,11 +57,11 @@ public class GenericDopClass<T extends EntityTrain, U extends IWheelDrawing> {
int i = random.nextInt(countTrains); int i = random.nextInt(countTrains);
int j = random.nextInt(countWheels); int j = random.nextInt(countWheels);
DrawingTrain drawingTrain; DrawingTrain drawingTrain;
if (Trains[i] instanceof EntityLoco){ if (Trains.get(i) instanceof EntityLoco){
drawingTrain = new DrawingLoco((EntityLoco)Trains[i], (IWheelDrawing)Wheels[j], _pictureWidth, _pictureHeight); drawingTrain = new DrawingLoco((EntityLoco)Trains.get(i), Wheels.get(j), _pictureWidth, _pictureHeight);
} }
else{ else{
drawingTrain = new DrawingTrain((EntityTrain)Trains[i], (IWheelDrawing)Wheels[j], _pictureWidth, _pictureHeight); drawingTrain = new DrawingTrain(Trains.get(i), Wheels.get(j), _pictureWidth, _pictureHeight);
} }
return drawingTrain; return drawingTrain;
} }