Skip to content

Commit

Permalink
Merge branch 'grafikus' into guitests
Browse files Browse the repository at this point in the history
  • Loading branch information
4321ba authored May 22, 2024
2 parents 90ebcae + aad0172 commit ab67465
Show file tree
Hide file tree
Showing 85 changed files with 547 additions and 14 deletions.
37 changes: 37 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: SonarCloud
on:
push:
branches:
- grafikus
pull_request:
types: [opened, synchronize, reopened]
jobs:
build:
name: Build and analyze
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: 17
distribution: 'zulu' # Alternative distribution options are available.
- name: Cache SonarCloud packages
uses: actions/cache@v3
with:
path: ~/.sonar/cache
key: ${{ runner.os }}-sonar
restore-keys: ${{ runner.os }}-sonar
- name: Cache Maven packages
uses: actions/cache@v3
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2
- name: Build and analyze
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
run: mvn -B -f drukmakor/pom.xml verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=BME-MIT-IET_iet-hf-2024-foaf-strukturalhatatlan_kenyer
2 changes: 1 addition & 1 deletion .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Java Maven Build & Publish Artifact

on:
push:
branches: [ "main", "maven_buildsystem", "grafikus", "guitests" ]
branches: [ "main", "maven_buildsystem", "grafikus", "guitests", "manualis_atvizsgalas" ]
pull_request:
branches: [ "main" ]

Expand Down
3 changes: 3 additions & 0 deletions .vs/ProjectSettings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"CurrentProjectSetting": null
}
10 changes: 10 additions & 0 deletions .vs/VSWorkspaceState.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"ExpandedNodes": [
"",
"\\.github",
"\\.github\\workflows",
"\\drukmakor"
],
"SelectedNode": "\\.github\\workflows\\build.yml",
"PreviewInSolutionExplorer": false
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
{
"Version": 1,
"WorkspaceRootPath": "C:\\Uni\\iet-hf-2024-foaf-strukturalhatatlan_kenyer\\",
"Documents": [
{
"AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Uni\\iet-hf-2024-foaf-strukturalhatatlan_kenyer\\.github\\workflows\\build.yml||{8B382828-6202-11D1-8870-0000F87579D2}",
"RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:.github\\workflows\\build.yml||{8B382828-6202-11D1-8870-0000F87579D2}"
},
{
"AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Uni\\iet-hf-2024-foaf-strukturalhatatlan_kenyer\\drukmakor\\pom.xml||{FA3CD31E-987B-443A-9B81-186104E8DAC1}",
"RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:drukmakor\\pom.xml||{FA3CD31E-987B-443A-9B81-186104E8DAC1}"
}
],
"DocumentGroupContainers": [
{
"Orientation": 0,
"VerticalTabListWidth": 256,
"DocumentGroups": [
{
"DockedWidth": 200,
"SelectedChildIndex": 0,
"Children": [
{
"$type": "Document",
"DocumentIndex": 0,
"Title": "build.yml",
"DocumentMoniker": "C:\\Uni\\iet-hf-2024-foaf-strukturalhatatlan_kenyer\\.github\\workflows\\build.yml",
"RelativeDocumentMoniker": ".github\\workflows\\build.yml",
"ToolTip": "C:\\Uni\\iet-hf-2024-foaf-strukturalhatatlan_kenyer\\.github\\workflows\\build.yml",
"RelativeToolTip": ".github\\workflows\\build.yml",
"ViewState": "AQIAAAkAAAAAAAAAAAAAACQAAAAoAAAA",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003775|",
"WhenOpened": "2024-05-22T15:06:02.789Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 1,
"Title": "pom.xml",
"DocumentMoniker": "C:\\Uni\\iet-hf-2024-foaf-strukturalhatatlan_kenyer\\drukmakor\\pom.xml",
"RelativeDocumentMoniker": "drukmakor\\pom.xml",
"ToolTip": "C:\\Uni\\iet-hf-2024-foaf-strukturalhatatlan_kenyer\\drukmakor\\pom.xml",
"RelativeToolTip": "drukmakor\\pom.xml",
"ViewState": "AQIAAAAAAAAAAAAAAAAAABMAAAABAAAA",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003576|",
"WhenOpened": "2024-05-22T15:05:23.417Z",
"EditorCaption": ""
}
]
}
]
}
]
}
Binary file added .vs/slnx.sqlite
Binary file not shown.
15 changes: 15 additions & 0 deletions doc/manualis_tesztek.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Tesztesetek létrehozása

A tesztek mappában található "tesztek_tervei.pdf" fájlban található először a tesztek terve egy átfogó táblázatban, majd a tesztek részletes leírása, a pontos kivitelezendő utasításokkal és a modell alapján várt kimenetekkel.

A tesztek tervezésénél igyekeztünk az alkalmazás funkcióit az összes eshetőségre kipróbálni például a szerelő a törött és nem törött és nem törött pumpát is megpróbálja megjavítani. Ezzel igyekeztünk elkerülni a pontatlanságból észre nem vett hibákat, melyek talán kikerülnék a tesztelés során a figyelmünket, hiszen triviálisan elronthatatlan eseteknek tűnnek első ránézésre.

Nem egyszerű feladat egy alkalmazás átfogó, minden esetre kitérő tesztelése.

# Manuális tesztelés elvégzése

A tesztelésről szóló pdf alapján szúró-próba szerűen elvégeztem a teszteseteket a fútó alkalmazásban. A tesztelés command line-on keresztül történt, ahova egyesével beírtam a parancsokat, majd ellenőriztem a kimeneteket az elvárt kimenetekkel. Minden ilyen elvégzett tesztet lefotóztam, mely képeket egy erre külön létrehozott mappában helyeztem el.

Az általam elvégzett tesztek nagy része ugyanazt a kimenetet adta, mint ami az elvárt volt. A pdf-ben 21-es sorszámmal jelölt teszteset viszont végeredményül a legutolsó parancs után rossz eredményt mutatott.

A tanulság amit levontam a manuális tesztelésből az a fontossága, ugyanis a jelenlegi példámból is látszik, hogy ugyan nem ellenőriztem mindet és a választásaim teljesen véletlenszerűek voltak, mégis sikerült találnom olyat ami nem helyesen működött. A rendszer éles működése közben is belefutna ugyanekkora valószínűséggel egy ilyen hibába a felhasználó, ami nagyon kellemetlen lenne. A manuális tesztelés által viszont a felhasználó bőrébe bújva tudjuk átvizsgálni a rendszert, hogy a lehető legtöbb hibát elimináljuk.
3 changes: 3 additions & 0 deletions drukmakor/.vs/ProjectSettings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"CurrentProjectSetting": null
}
11 changes: 11 additions & 0 deletions drukmakor/.vs/VSWorkspaceState.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"ExpandedNodes": [
"",
"\\src",
"\\src\\main",
"\\src\\main\\java",
"\\src\\main\\java\\drukmakor"
],
"SelectedNode": "\\src\\main\\java\\drukmakor\\Desert.java",
"PreviewInSolutionExplorer": false
}
Binary file not shown.
Binary file added drukmakor/.vs/drukmakor/v17/.wsuo
Binary file not shown.
122 changes: 122 additions & 0 deletions drukmakor/.vs/drukmakor/v17/DocumentLayout.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,122 @@
{
"Version": 1,
"WorkspaceRootPath": "C:\\Uni\\IV\\iet-hf-2024-foaf-strukturalhatatlan_kenyer\\drukmakor\\",
"Documents": [
{
"AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Uni\\IV\\iet-hf-2024-foaf-strukturalhatatlan_kenyer\\drukmakor\\src\\main\\java\\drukmakor\\Desert.java||{3B902123-F8A7-4915-9F01-361F908088D0}",
"RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:src\\main\\java\\drukmakor\\Desert.java||{3B902123-F8A7-4915-9F01-361F908088D0}"
},
{
"AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Uni\\IV\\iet-hf-2024-foaf-strukturalhatatlan_kenyer\\drukmakor\\src\\main\\java\\drukmakor\\Coords.java||{3B902123-F8A7-4915-9F01-361F908088D0}",
"RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:src\\main\\java\\drukmakor\\Coords.java||{3B902123-F8A7-4915-9F01-361F908088D0}"
},
{
"AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Uni\\IV\\iet-hf-2024-foaf-strukturalhatatlan_kenyer\\drukmakor\\src\\main\\java\\drukmakor\\CisternView.java||{3B902123-F8A7-4915-9F01-361F908088D0}",
"RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:src\\main\\java\\drukmakor\\CisternView.java||{3B902123-F8A7-4915-9F01-361F908088D0}"
},
{
"AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Uni\\IV\\iet-hf-2024-foaf-strukturalhatatlan_kenyer\\drukmakor\\src\\main\\java\\drukmakor\\Cistern.java||{3B902123-F8A7-4915-9F01-361F908088D0}",
"RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:src\\main\\java\\drukmakor\\Cistern.java||{3B902123-F8A7-4915-9F01-361F908088D0}"
},
{
"AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Uni\\IV\\iet-hf-2024-foaf-strukturalhatatlan_kenyer\\drukmakor\\src\\main\\java\\drukmakor\\CharacterView.java||{3B902123-F8A7-4915-9F01-361F908088D0}",
"RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:src\\main\\java\\drukmakor\\CharacterView.java||{3B902123-F8A7-4915-9F01-361F908088D0}"
},
{
"AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Uni\\IV\\iet-hf-2024-foaf-strukturalhatatlan_kenyer\\drukmakor\\src\\main\\java\\drukmakor\\Character.java||{3B902123-F8A7-4915-9F01-361F908088D0}",
"RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:src\\main\\java\\drukmakor\\Character.java||{3B902123-F8A7-4915-9F01-361F908088D0}"
}
],
"DocumentGroupContainers": [
{
"Orientation": 0,
"VerticalTabListWidth": 256,
"DocumentGroups": [
{
"DockedWidth": 200,
"SelectedChildIndex": 0,
"Children": [
{
"$type": "Document",
"DocumentIndex": 0,
"Title": "Desert.java",
"DocumentMoniker": "C:\\Uni\\IV\\iet-hf-2024-foaf-strukturalhatatlan_kenyer\\drukmakor\\src\\main\\java\\drukmakor\\Desert.java",
"RelativeDocumentMoniker": "src\\main\\java\\drukmakor\\Desert.java",
"ToolTip": "C:\\Uni\\IV\\iet-hf-2024-foaf-strukturalhatatlan_kenyer\\drukmakor\\src\\main\\java\\drukmakor\\Desert.java",
"RelativeToolTip": "src\\main\\java\\drukmakor\\Desert.java",
"ViewState": "AQIAADAAAAAAAAAAAAAAAEAAAAAAAAAA",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001001|",
"WhenOpened": "2024-05-21T16:03:27.467Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 1,
"Title": "Coords.java",
"DocumentMoniker": "C:\\Uni\\IV\\iet-hf-2024-foaf-strukturalhatatlan_kenyer\\drukmakor\\src\\main\\java\\drukmakor\\Coords.java",
"RelativeDocumentMoniker": "src\\main\\java\\drukmakor\\Coords.java",
"ToolTip": "C:\\Uni\\IV\\iet-hf-2024-foaf-strukturalhatatlan_kenyer\\drukmakor\\src\\main\\java\\drukmakor\\Coords.java",
"RelativeToolTip": "src\\main\\java\\drukmakor\\Coords.java",
"ViewState": "AQIAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001001|",
"WhenOpened": "2024-05-21T16:03:17.776Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 2,
"Title": "CisternView.java",
"DocumentMoniker": "C:\\Uni\\IV\\iet-hf-2024-foaf-strukturalhatatlan_kenyer\\drukmakor\\src\\main\\java\\drukmakor\\CisternView.java",
"RelativeDocumentMoniker": "src\\main\\java\\drukmakor\\CisternView.java",
"ToolTip": "C:\\Uni\\IV\\iet-hf-2024-foaf-strukturalhatatlan_kenyer\\drukmakor\\src\\main\\java\\drukmakor\\CisternView.java",
"RelativeToolTip": "src\\main\\java\\drukmakor\\CisternView.java",
"ViewState": "AQIAABsAAAAAAAAAAAAAAAAAAAAAAAAA",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001001|",
"WhenOpened": "2024-05-21T16:03:14.241Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 3,
"Title": "Cistern.java",
"DocumentMoniker": "C:\\Uni\\IV\\iet-hf-2024-foaf-strukturalhatatlan_kenyer\\drukmakor\\src\\main\\java\\drukmakor\\Cistern.java",
"RelativeDocumentMoniker": "src\\main\\java\\drukmakor\\Cistern.java",
"ToolTip": "C:\\Uni\\IV\\iet-hf-2024-foaf-strukturalhatatlan_kenyer\\drukmakor\\src\\main\\java\\drukmakor\\Cistern.java",
"RelativeToolTip": "src\\main\\java\\drukmakor\\Cistern.java",
"ViewState": "AQIAAEgAAAAAAAAAAAAAADMAAAAAAAAA",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001001|",
"WhenOpened": "2024-05-21T16:02:56.634Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 4,
"Title": "CharacterView.java",
"DocumentMoniker": "C:\\Uni\\IV\\iet-hf-2024-foaf-strukturalhatatlan_kenyer\\drukmakor\\src\\main\\java\\drukmakor\\CharacterView.java",
"RelativeDocumentMoniker": "src\\main\\java\\drukmakor\\CharacterView.java",
"ToolTip": "C:\\Uni\\IV\\iet-hf-2024-foaf-strukturalhatatlan_kenyer\\drukmakor\\src\\main\\java\\drukmakor\\CharacterView.java",
"RelativeToolTip": "src\\main\\java\\drukmakor\\CharacterView.java",
"ViewState": "AQIAAAAAAAAAAAAAAAAAABoAAAAAAAAA",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001001|",
"WhenOpened": "2024-05-21T16:02:45.734Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 5,
"Title": "Character.java",
"DocumentMoniker": "C:\\Uni\\IV\\iet-hf-2024-foaf-strukturalhatatlan_kenyer\\drukmakor\\src\\main\\java\\drukmakor\\Character.java",
"RelativeDocumentMoniker": "src\\main\\java\\drukmakor\\Character.java",
"ToolTip": "C:\\Uni\\IV\\iet-hf-2024-foaf-strukturalhatatlan_kenyer\\drukmakor\\src\\main\\java\\drukmakor\\Character.java",
"RelativeToolTip": "src\\main\\java\\drukmakor\\Character.java",
"ViewState": "AQIAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001001|",
"WhenOpened": "2024-05-21T16:02:44.699Z",
"EditorCaption": ""
}
]
}
]
}
]
}
Binary file added drukmakor/.vs/slnx.sqlite
Binary file not shown.
2 changes: 2 additions & 0 deletions drukmakor/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<sonar.organization>bme-mit-iet-org</sonar.organization>
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
</properties>

<dependencies> <!--
Expand Down
3 changes: 1 addition & 2 deletions drukmakor/src/main/java/drukmakor/CharacterView.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@ public abstract class CharacterView implements Drawable {
*/
@Override public void draw(Graphics g) { // leszármazott állít színt!!
Coords c = getModel().getCurrentPosition().getView().getCoords();
//Kis képekre váltottunk, nincs szerepe a téglalapnak
// g.drawRect(c.x-5, c.y-15, 10, 20);

if (soros) {
g.setColor(new Color(186,27,27));
g.fillOval(c.x - 6, c.y - 27, 12, 12);
Expand Down
4 changes: 1 addition & 3 deletions drukmakor/src/main/java/drukmakor/Cistern.java
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ public class Cistern extends ActiveElement {
@Override public void pullWater() {
for (Pipe p : pipes)
if (p != null && p.drainWater()) {
// 50 PONT A GRIFFENDÉLNEK
PointCounter.get().addMechanicPoint();
++waterLevel;
}
Expand All @@ -49,7 +48,6 @@ public class Cistern extends ActiveElement {
if (p != null && waterLevel > 0)
if (p.wasteWater()) {
PointCounter.get().subtractMechanicPoint();
// -50 PONT A GRIFFENDÉLNEK
--waterLevel;
}
}
Expand All @@ -68,7 +66,7 @@ public class Cistern extends ActiveElement {
*/
@Override
public Object[] get() {
int noValidPipes = MAX_CONNECTIONS; // number of valid pipes
int noValidPipes = MAX_CONNECTIONS; // érvényes csövek száma
while (noValidPipes > 0 && pipes[noValidPipes - 1] == null)
noValidPipes--;
Object[] ret = new Object[noValidPipes + 1]; // <csövek> <vízszint (egész szám)>
Expand Down
2 changes: 0 additions & 2 deletions drukmakor/src/main/java/drukmakor/Desert.java
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,6 @@ public synchronized void clearDrawable() {
super.paintComponent(g);
TexturePaint tp = new TexturePaint(sandImage, new Rectangle(0, 0, sandImage.getWidth(), sandImage.getHeight()));

/*g.setColor(new Color(140, 78, 7));
g.fillRect(0, 0, getWidth(), getHeight());*/

Graphics2D g2 = (Graphics2D) g;
g2.setPaint(tp);
Expand Down
5 changes: 2 additions & 3 deletions drukmakor/src/main/java/drukmakor/Pipe.java
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,6 @@ public boolean drainWater() {
*/
public boolean wasteWater() {
if ((end1 == null || end2 == null) && !(end1Carried || end2Carried)) { // dangling: azaz az egyik vége null, és nem szállítják
//50 PONT A GRIFFENDÉLNEK
PointCounter.get().addSaboteurPoint();
return true;
}
Expand All @@ -259,11 +258,11 @@ public boolean wasteWater() {
@Override public boolean placePump(Pump p) {
// occupied csövet nem lehet felszedni!
ActiveElement prevend1 = end1;
isOccupied = false; //temporary, hogy a többi működjön
isOccupied = false; //ideiglenes, hogy a többi működjön
end1.disconnectPipe(this);
Proto.newPipe(prevend1, p); //Productionben nem Proto. dolog lesz hanem new Pipe(args)
boolean res2 = p.connectPipe(this, -1);
isOccupied = true; // íme, itt vissza is jött
isOccupied = true;
if (!res2)
throw new RuntimeException("A cső csatlakoztatása az új pumpához sikertelen!");

Expand Down
2 changes: 1 addition & 1 deletion drukmakor/src/main/java/drukmakor/Pump.java
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public void pullWater() {
*/
@Override
public Object[] get() {
int noValidPipes = MAX_CONNECTIONS; // number of valid pipes
int noValidPipes = MAX_CONNECTIONS; // érvényes csöveg száma
while (noValidPipes > 0 && pipes[noValidPipes - 1] == null)
noValidPipes--;
Object[] ret = new Object[noValidPipes + 4]; // <csövek> <van-e benne víz> <eltört-e> <bemeneti index> <kimeneti index>
Expand Down
2 changes: 1 addition & 1 deletion drukmakor/src/main/java/drukmakor/Source.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public class Source extends ActiveElement {
*/
@Override
public Object[] get() {
int noValidPipes = MAX_CONNECTIONS; // number of valid pipes
int noValidPipes = MAX_CONNECTIONS; // érvényes csövek száma
while (noValidPipes > 0 && pipes[noValidPipes - 1] == null)
noValidPipes--;
Object[] ret = new Object[noValidPipes]; // <csövek>
Expand Down
1 change: 0 additions & 1 deletion drukmakor/src/main/java/drukmakor/TitleFrame.java
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,6 @@ public void actionPerformed(ActionEvent e) {
toggleButton.setVisible(true);
bgPanel[0].setVisible(true);
bgPanel[activeNo].setVisible(true);
//bgPanel[2].setVisible(true);
}
}

Expand Down
6 changes: 6 additions & 0 deletions tesztek/1-16/1-16/10_inp.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
add pu
add pu
add pi pu1 pu2
add me pi1
add sa pu1
moveto me1 pu1
5 changes: 5 additions & 0 deletions tesztek/1-16/1-16/11_inp.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
add so
add pu
add pi so1 pu1
add sa pi1
moveto sa1 so1
Loading

0 comments on commit ab67465

Please sign in to comment.