diff --git a/.DS_Store b/.DS_Store index 13647a3..8be5a50 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/.gitignore b/.gitignore index d8dc5c3..0c08f64 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,5 @@ hs_err_pid* /lista02/ex02/ex02-Netbeans/build/ /lista02/ex02/ex02-Netbeans/nbproject/private/ /lista02/lista02-ex03/target/ +/lista02/ex02/ex01/nbproject/private/ +/lista03/ex01/ex01/nbproject/private/ \ No newline at end of file diff --git a/lista02/.DS_Store b/lista02/.DS_Store index c62ecb8..7e4573e 100644 Binary files a/lista02/.DS_Store and b/lista02/.DS_Store differ diff --git a/lista02/ex02/.DS_Store b/lista02/ex02/.DS_Store index dc45196..46862b8 100644 Binary files a/lista02/ex02/.DS_Store and b/lista02/ex02/.DS_Store differ diff --git a/lista03/.DS_Store b/lista03/.DS_Store new file mode 100644 index 0000000..140d08f Binary files /dev/null and b/lista03/.DS_Store differ diff --git a/lista03/ex01/build.xml b/lista03/ex01/build.xml new file mode 100644 index 0000000..da15254 --- /dev/null +++ b/lista03/ex01/build.xml @@ -0,0 +1,73 @@ + + + + + + + + + + + Builds, tests, and runs the project ex01. + + + diff --git a/lista03/ex01/manifest.mf b/lista03/ex01/manifest.mf new file mode 100644 index 0000000..328e8e5 --- /dev/null +++ b/lista03/ex01/manifest.mf @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +X-COMMENT: Main-Class will be added automatically by build + diff --git a/lista03/ex01/nbproject/build-impl.xml b/lista03/ex01/nbproject/build-impl.xml new file mode 100644 index 0000000..777da34 --- /dev/null +++ b/lista03/ex01/nbproject/build-impl.xml @@ -0,0 +1,1771 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must set src.dir + Must set test.src.dir + Must set build.dir + Must set dist.dir + Must set build.classes.dir + Must set dist.javadoc.dir + Must set build.test.classes.dir + Must set build.test.results.dir + Must set build.classes.excludes + Must set dist.jar + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must set javac.includes + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + No tests executed. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must set JVM to use for profiling in profiler.info.jvm + Must set profiler agent JVM arguments in profiler.info.jvmargs.agent + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must select some files in the IDE or set javac.includes + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + To run this application from the command line without Ant, try: + + java -jar "${dist.jar.resolved}" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must select one file in the IDE or set run.class + + + + Must select one file in the IDE or set run.class + + + + + + + + + + + + + + + + + + + + + + + Must select one file in the IDE or set debug.class + + + + + Must select one file in the IDE or set debug.class + + + + + Must set fix.includes + + + + + + + + + + This target only works when run from inside the NetBeans IDE. + + + + + + + + + Must select one file in the IDE or set profile.class + This target only works when run from inside the NetBeans IDE. + + + + + + + + + This target only works when run from inside the NetBeans IDE. + + + + + + + + + + + + + This target only works when run from inside the NetBeans IDE. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must select one file in the IDE or set run.class + + + + + + Must select some files in the IDE or set test.includes + + + + + Must select one file in the IDE or set run.class + + + + + Must select one file in the IDE or set applet.url + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must select some files in the IDE or set javac.includes + + + + + + + + + + + + + + + + + + + + + + + + Some tests failed; see details above. + + + + + + + + + Must select some files in the IDE or set test.includes + + + + Some tests failed; see details above. + + + + Must select some files in the IDE or set test.class + Must select some method in the IDE or set test.method + + + + Some tests failed; see details above. + + + + + Must select one file in the IDE or set test.class + + + + Must select one file in the IDE or set test.class + Must select some method in the IDE or set test.method + + + + + + + + + + + + + + + Must select one file in the IDE or set applet.url + + + + + + + + + Must select one file in the IDE or set applet.url + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/lista03/ex01/nbproject/genfiles.properties b/lista03/ex01/nbproject/genfiles.properties new file mode 100644 index 0000000..549a49b --- /dev/null +++ b/lista03/ex01/nbproject/genfiles.properties @@ -0,0 +1,8 @@ +build.xml.data.CRC32=c5f64278 +build.xml.script.CRC32=5d7510be +build.xml.stylesheet.CRC32=f85dc8f2@1.103.0.48 +# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. +# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. +nbproject/build-impl.xml.data.CRC32=c5f64278 +nbproject/build-impl.xml.script.CRC32=544fa240 +nbproject/build-impl.xml.stylesheet.CRC32=12e0a6c2@1.103.0.48 diff --git a/lista03/ex01/nbproject/private/private.properties b/lista03/ex01/nbproject/private/private.properties new file mode 100644 index 0000000..a5733ea --- /dev/null +++ b/lista03/ex01/nbproject/private/private.properties @@ -0,0 +1,2 @@ +compile.on.save=true +user.properties.file=/Users/arturbrennerweber/Library/Application Support/NetBeans/14/build.properties diff --git a/lista03/ex01/nbproject/private/private.xml b/lista03/ex01/nbproject/private/private.xml new file mode 100644 index 0000000..0473c0b --- /dev/null +++ b/lista03/ex01/nbproject/private/private.xml @@ -0,0 +1,13 @@ + + + + + + file:/Users/arturbrennerweber/Desktop/4º%20Período/Programação%20Orientada%20a%20Objetos%20-%20SCC0604/SCC0604-POO-2022.2/lista03/ex01/ex01/src/ex01/Automovel.java + file:/Users/arturbrennerweber/Desktop/4º%20Período/Programação%20Orientada%20a%20Objetos%20-%20SCC0604/SCC0604-POO-2022.2/lista03/ex01/ex01/src/ex01/Test.java + file:/Users/arturbrennerweber/Desktop/4º%20Período/Programação%20Orientada%20a%20Objetos%20-%20SCC0604/SCC0604-POO-2022.2/lista03/ex01/ex01/src/ex01/Oficina.java + file:/Users/arturbrennerweber/Desktop/4º%20Período/Programação%20Orientada%20a%20Objetos%20-%20SCC0604/SCC0604-POO-2022.2/lista03/ex01/ex01/src/ex01/Veiculo.java + file:/Users/arturbrennerweber/Desktop/4º%20Período/Programação%20Orientada%20a%20Objetos%20-%20SCC0604/SCC0604-POO-2022.2/lista03/ex01/ex01/src/ex01/Bicicleta.java + + + diff --git a/lista03/ex01/nbproject/project.properties b/lista03/ex01/nbproject/project.properties new file mode 100644 index 0000000..51c0dcf --- /dev/null +++ b/lista03/ex01/nbproject/project.properties @@ -0,0 +1,95 @@ +annotation.processing.enabled=true +annotation.processing.enabled.in.editor=false +annotation.processing.processor.options= +annotation.processing.processors.list= +annotation.processing.run.all.processors=true +annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output +build.classes.dir=${build.dir}/classes +build.classes.excludes=**/*.java,**/*.form +# This directory is removed when the project is cleaned: +build.dir=build +build.generated.dir=${build.dir}/generated +build.generated.sources.dir=${build.dir}/generated-sources +# Only compile against the classpath explicitly listed here: +build.sysclasspath=ignore +build.test.classes.dir=${build.dir}/test/classes +build.test.results.dir=${build.dir}/test/results +# Uncomment to specify the preferred debugger connection transport: +#debug.transport=dt_socket +debug.classpath=\ + ${run.classpath} +debug.modulepath=\ + ${run.modulepath} +debug.test.classpath=\ + ${run.test.classpath} +debug.test.modulepath=\ + ${run.test.modulepath} +# Files in build.classes.dir which should be excluded from distribution jar +dist.archive.excludes= +# This directory is removed when the project is cleaned: +dist.dir=dist +dist.jar=${dist.dir}/ex01.jar +dist.javadoc.dir=${dist.dir}/javadoc +dist.jlink.dir=${dist.dir}/jlink +dist.jlink.output=${dist.jlink.dir}/ex01 +excludes= +includes=** +jar.compress=false +javac.classpath= +# Space-separated list of extra javac options +javac.compilerargs= +javac.deprecation=false +javac.external.vm=true +javac.modulepath= +javac.processormodulepath= +javac.processorpath=\ + ${javac.classpath} +javac.source=1.8 +javac.target=1.8 +javac.test.classpath=\ + ${javac.classpath}:\ + ${build.classes.dir} +javac.test.modulepath=\ + ${javac.modulepath} +javac.test.processorpath=\ + ${javac.test.classpath} +javadoc.additionalparam= +javadoc.author=false +javadoc.encoding=${source.encoding} +javadoc.html5=false +javadoc.noindex=false +javadoc.nonavbar=false +javadoc.notree=false +javadoc.private=false +javadoc.splitindex=true +javadoc.use=true +javadoc.version=false +javadoc.windowtitle= +# The jlink additional root modules to resolve +jlink.additionalmodules= +# The jlink additional command line parameters +jlink.additionalparam= +jlink.launcher=true +jlink.launcher.name=ex01 +main.class=ex01.Ex01 +manifest.file=manifest.mf +meta.inf.dir=${src.dir}/META-INF +mkdist.disabled=false +platform.active=default_platform +run.classpath=\ + ${javac.classpath}:\ + ${build.classes.dir} +# Space-separated list of JVM arguments used when running the project. +# You may also define separate properties like run-sys-prop.name=value instead of -Dname=value. +# To set system properties for unit tests define test-sys-prop.name=value: +run.jvmargs= +run.modulepath=\ + ${javac.modulepath} +run.test.classpath=\ + ${javac.test.classpath}:\ + ${build.test.classes.dir} +run.test.modulepath=\ + ${javac.test.modulepath} +source.encoding=UTF-8 +src.dir=src +test.src.dir=test diff --git a/lista03/ex01/nbproject/project.xml b/lista03/ex01/nbproject/project.xml new file mode 100644 index 0000000..837872d --- /dev/null +++ b/lista03/ex01/nbproject/project.xml @@ -0,0 +1,15 @@ + + + org.netbeans.modules.java.j2seproject + + + ex01 + + + + + + + + + diff --git a/lista03/ex01/src/ex01/Automovel.java b/lista03/ex01/src/ex01/Automovel.java new file mode 100644 index 0000000..f7592fd --- /dev/null +++ b/lista03/ex01/src/ex01/Automovel.java @@ -0,0 +1,26 @@ +package ex01; + +public class Automovel extends Veiculo { + protected String placa; + + Automovel (float precoAutomovel, String modeloAutomovel, String marcaAutomovel, String corAutomovel, String placaAutomovel) { + super(precoAutomovel, modeloAutomovel, marcaAutomovel, corAutomovel); + placa = placaAutomovel; + } + + void listarVerificacoes() { + System.out.println("Verificacoes"); + } + + void ajustar() { + System.out.println("Ajustado"); + } + + void limpar() { + System.out.println("Limpado"); + } + + void trocarOleo() { + System.out.println("oleo trocado"); + } +} diff --git a/lista03/ex01/src/ex01/Bicicleta.java b/lista03/ex01/src/ex01/Bicicleta.java new file mode 100644 index 0000000..8835064 --- /dev/null +++ b/lista03/ex01/src/ex01/Bicicleta.java @@ -0,0 +1,25 @@ +package ex01; + +public class Bicicleta extends Veiculo { + private int numMarchas; + private int aroRoda; + + + Bicicleta (float precoBicicleta, String modeloBicicleta, String marcaBicicleta, String corBicicleta, int numMarchasBicicleta, int aroRodasBicicleta){ + super(precoBicicleta, modeloBicicleta, marcaBicicleta, corBicicleta); + this.numMarchas = numMarchasBicicleta; + this.aroRoda = aroRodasBicicleta; + } + + void listarVerificacoes() { + System.out.println("Verificacoes");; + } + + void ajustar() { + System.out.println("Ajustado");; + } + + void limpar() { + System.out.println("Limpo");; + } +} diff --git a/lista03/ex01/src/ex01/Oficina.java b/lista03/ex01/src/ex01/Oficina.java new file mode 100644 index 0000000..fc2544c --- /dev/null +++ b/lista03/ex01/src/ex01/Oficina.java @@ -0,0 +1,33 @@ +package ex01; + +import java.util.ArrayList; + +public class Oficina extends ArrayList{ + + private ArrayList veiculos; + private int proximo = -1; + + Oficina (){ + veiculos = new ArrayList(); + veiculos.add(new Bicicleta(1000, "Caloi 10", "Caloi", "Dourada", 21, 700)); + veiculos.add(new Automovel(50000, "Kwid", "Renault", "Branco", "AUB-5A92")); + } + + public Veiculo proximo() { + proximo++; + return veiculos.get(proximo); + } + + public void manutencao(Veiculo v) { + v.listarVerificacoes(); + v.ajustar(); + v.limpar(); + + if(v instanceof Automovel){ + ((Automovel)v).trocarOleo(); + } + } + + + +} diff --git a/lista03/ex01/src/ex01/Veiculo.java b/lista03/ex01/src/ex01/Veiculo.java new file mode 100644 index 0000000..557daee --- /dev/null +++ b/lista03/ex01/src/ex01/Veiculo.java @@ -0,0 +1,22 @@ +package ex01; + +public abstract class Veiculo { + + private float preco; + private String modelo; + private String marca; + private String cor; + + + Veiculo (float precoVeiculo, String modeloVeiculo, String marcaVeiculo, String corVeiculo) { + this.preco = precoVeiculo; + this.modelo = modeloVeiculo; + this.marca = marcaVeiculo; + this.cor = corVeiculo; + } + + + abstract void listarVerificacoes(); + abstract void ajustar(); + abstract void limpar(); +} diff --git a/lista03/ex01/src/ex01/ex01.java b/lista03/ex01/src/ex01/ex01.java new file mode 100644 index 0000000..b7b3088 --- /dev/null +++ b/lista03/ex01/src/ex01/ex01.java @@ -0,0 +1,12 @@ +package ex01; + +class ex01{ + public static void main(String[] args){ + Oficina o = new Oficina(); + Veiculo v; + for(int i = 0; i < 4; ++i){ + v = o.proximo(); + o.manutencao(v); + } + } +} \ No newline at end of file