diff --git a/.metadata/.log b/.metadata/.log index 537b9a3..3c42ea3 100644 --- a/.metadata/.log +++ b/.metadata/.log @@ -4288,3 +4288,136 @@ java.lang.ClassCastException: class org.eclipse.jdt.internal.corext.fix.LinkedPr at org.eclipse.equinox.launcher.Main.main(Main.java:1440) ======= >>>>>>> aefdc99b447f4c2e53fc68e4066d71ca85feec2e +!SESSION 2022-03-23 12:15:27.224 ----------------------------------------------- +eclipse.buildId=4.23.0.I20220308-0310 +java.version=16.0.1 +java.vendor=Oracle Corporation +BootLoader constants: OS=win32, ARCH=x86_64, WS=win32, NL=es_ES +Framework arguments: -product org.eclipse.epp.package.java.product +Command-line arguments: -os win32 -ws win32 -arch x86_64 -product org.eclipse.epp.package.java.product + +!ENTRY org.eclipse.e4.ui.workbench 4 0 2022-03-23 12:15:31.728 +!MESSAGE Unable to load resource file:/C:/Users/mario/Documents/GitHub/MarioGabIFP/Super_Paco_Bros/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi +!STACK 0 +org.eclipse.emf.ecore.resource.impl.ResourceSetImpl$1DiagnosticWrappedException: org.xml.sax.SAXParseExceptionpublicId: file:/C:/Users/mario/Documents/GitHub/MarioGabIFP/Super_Paco_Bros/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi; systemId: file:/C:/Users/mario/Documents/GitHub/MarioGabIFP/Super_Paco_Bros/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi; lineNumber: 2; columnNumber: 2; The markup in the document preceding the root element must be well-formed. + at org.eclipse.emf.ecore.resource.impl.ResourceSetImpl.handleDemandLoadException(ResourceSetImpl.java:319) + at org.eclipse.emf.ecore.resource.impl.ResourceSetImpl.demandLoadHelper(ResourceSetImpl.java:278) + at org.eclipse.emf.ecore.resource.impl.ResourceSetImpl.getResource(ResourceSetImpl.java:406) + at org.eclipse.e4.ui.internal.workbench.ResourceHandler.getResource(ResourceHandler.java:290) + at org.eclipse.e4.ui.internal.workbench.ResourceHandler.loadResource(ResourceHandler.java:266) + at org.eclipse.e4.ui.internal.workbench.ResourceHandler.loadMostRecentModel(ResourceHandler.java:169) + at org.eclipse.e4.ui.internal.workbench.swt.E4Application.loadApplicationModel(E4Application.java:371) + at org.eclipse.e4.ui.internal.workbench.swt.E4Application.createE4Workbench(E4Application.java:247) + at org.eclipse.ui.internal.Workbench.lambda$3(Workbench.java:573) + at org.eclipse.core.databinding.observable.Realm.runWithDefault(Realm.java:338) + at org.eclipse.ui.internal.Workbench.createAndRunWorkbench(Workbench.java:551) + at org.eclipse.ui.PlatformUI.createAndRunWorkbench(PlatformUI.java:156) + at org.eclipse.ui.internal.ide.application.IDEApplication.start(IDEApplication.java:152) + at org.eclipse.equinox.internal.app.EclipseAppHandle.run(EclipseAppHandle.java:203) + at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.runApplication(EclipseAppLauncher.java:136) + at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.start(EclipseAppLauncher.java:104) + at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:401) + at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:255) + at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) + at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:78) + at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) + at java.base/java.lang.reflect.Method.invoke(Method.java:567) + at org.eclipse.equinox.launcher.Main.invokeFramework(Main.java:659) + at org.eclipse.equinox.launcher.Main.basicRun(Main.java:596) + at org.eclipse.equinox.launcher.Main.run(Main.java:1467) + at org.eclipse.equinox.launcher.Main.main(Main.java:1440) +Caused by: org.xml.sax.SAXParseExceptionpublicId: file:/C:/Users/mario/Documents/GitHub/MarioGabIFP/Super_Paco_Bros/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi; systemId: file:/C:/Users/mario/Documents/GitHub/MarioGabIFP/Super_Paco_Bros/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi; lineNumber: 2; columnNumber: 2; The markup in the document preceding the root element must be well-formed. + at java.xml/com.sun.org.apache.xerces.internal.util.ErrorHandlerWrapper.createSAXParseException(ErrorHandlerWrapper.java:204) + at java.xml/com.sun.org.apache.xerces.internal.util.ErrorHandlerWrapper.fatalError(ErrorHandlerWrapper.java:178) + at java.xml/com.sun.org.apache.xerces.internal.impl.XMLErrorReporter.reportError(XMLErrorReporter.java:400) + at java.xml/com.sun.org.apache.xerces.internal.impl.XMLErrorReporter.reportError(XMLErrorReporter.java:327) + at java.xml/com.sun.org.apache.xerces.internal.impl.XMLScanner.reportFatalError(XMLScanner.java:1471) + at java.xml/com.sun.org.apache.xerces.internal.impl.XMLDocumentScannerImpl$PrologDriver.next(XMLDocumentScannerImpl.java:862) + at java.xml/com.sun.org.apache.xerces.internal.impl.XMLDocumentScannerImpl.next(XMLDocumentScannerImpl.java:605) + at java.xml/com.sun.org.apache.xerces.internal.impl.XMLNSDocumentScannerImpl.next(XMLNSDocumentScannerImpl.java:112) + at java.xml/com.sun.org.apache.xerces.internal.impl.XMLDocumentFragmentScannerImpl.scanDocument(XMLDocumentFragmentScannerImpl.java:541) + at java.xml/com.sun.org.apache.xerces.internal.parsers.XML11Configuration.parse(XML11Configuration.java:888) + at java.xml/com.sun.org.apache.xerces.internal.parsers.XML11Configuration.parse(XML11Configuration.java:824) + at java.xml/com.sun.org.apache.xerces.internal.parsers.XMLParser.parse(XMLParser.java:141) + at java.xml/com.sun.org.apache.xerces.internal.parsers.AbstractSAXParser.parse(AbstractSAXParser.java:1224) + at java.xml/com.sun.org.apache.xerces.internal.jaxp.SAXParserImpl$JAXPSAXParser.parse(SAXParserImpl.java:635) + at java.xml/com.sun.org.apache.xerces.internal.jaxp.SAXParserImpl.parse(SAXParserImpl.java:324) + at org.eclipse.emf.ecore.xmi.impl.XMLLoadImpl.load(XMLLoadImpl.java:175) + at org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl.doLoad(XMLResourceImpl.java:261) + at org.eclipse.emf.ecore.resource.impl.ResourceImpl.load(ResourceImpl.java:1563) + at org.eclipse.emf.ecore.resource.impl.ResourceImpl.load(ResourceImpl.java:1342) + at org.eclipse.emf.ecore.resource.impl.ResourceSetImpl.demandLoad(ResourceSetImpl.java:259) + at org.eclipse.emf.ecore.resource.impl.ResourceSetImpl.demandLoadHelper(ResourceSetImpl.java:274) + ... 24 more + +!ENTRY org.eclipse.e4.ui.workbench 4 0 2022-03-23 12:15:31.732 +!MESSAGE The persisted application model has no top-level window. Reinitializing with the default application model. +!STACK 0 +java.lang.Exception + at org.eclipse.e4.ui.internal.workbench.ResourceHandler.loadMostRecentModel(ResourceHandler.java:174) + at org.eclipse.e4.ui.internal.workbench.swt.E4Application.loadApplicationModel(E4Application.java:371) + at org.eclipse.e4.ui.internal.workbench.swt.E4Application.createE4Workbench(E4Application.java:247) + at org.eclipse.ui.internal.Workbench.lambda$3(Workbench.java:573) + at org.eclipse.core.databinding.observable.Realm.runWithDefault(Realm.java:338) + at org.eclipse.ui.internal.Workbench.createAndRunWorkbench(Workbench.java:551) + at org.eclipse.ui.PlatformUI.createAndRunWorkbench(PlatformUI.java:156) + at org.eclipse.ui.internal.ide.application.IDEApplication.start(IDEApplication.java:152) + at org.eclipse.equinox.internal.app.EclipseAppHandle.run(EclipseAppHandle.java:203) + at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.runApplication(EclipseAppLauncher.java:136) + at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.start(EclipseAppLauncher.java:104) + at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:401) + at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:255) + at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) + at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:78) + at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) + at java.base/java.lang.reflect.Method.invoke(Method.java:567) + at org.eclipse.equinox.launcher.Main.invokeFramework(Main.java:659) + at org.eclipse.equinox.launcher.Main.basicRun(Main.java:596) + at org.eclipse.equinox.launcher.Main.run(Main.java:1467) + at org.eclipse.equinox.launcher.Main.main(Main.java:1440) + +!ENTRY org.eclipse.jface 2 0 2022-03-23 12:15:34.909 +!MESSAGE Keybinding conflicts occurred. They may interfere with normal accelerator operation. +!SUBENTRY 1 org.eclipse.jface 2 0 2022-03-23 12:15:34.910 +!MESSAGE A conflict occurred for CTRL+SHIFT+T: +Binding(CTRL+SHIFT+T, + ParameterizedCommand(Command(org.eclipse.lsp4e.symbolinworkspace,Go to Symbol in Workspace, + , + Category(org.eclipse.lsp4e.category,Language Servers,null,true), + org.eclipse.ui.internal.WorkbenchHandlerServiceHandler@23d978b, + ,,true),null), + org.eclipse.ui.defaultAcceleratorConfiguration, + org.eclipse.ui.contexts.window,,,system) +Binding(CTRL+SHIFT+T, + ParameterizedCommand(Command(org.eclipse.jdt.ui.navigate.open.type,Open Type, + Open a type in a Java editor, + Category(org.eclipse.ui.category.navigate,Navigate,null,true), + org.eclipse.ui.internal.WorkbenchHandlerServiceHandler@3cf70afa, + ,,true),null), + org.eclipse.ui.defaultAcceleratorConfiguration, + org.eclipse.ui.contexts.window,,,system) +!SUBENTRY 1 org.eclipse.jface 2 0 2022-03-23 12:15:34.910 +!MESSAGE A conflict occurred for ALT+SHIFT+R: +Binding(ALT+SHIFT+R, + ParameterizedCommand(Command(org.eclipse.ui.edit.rename,Rename, + Rename the selected item, + Category(org.eclipse.ui.category.file,File,null,true), + org.eclipse.ui.internal.WorkbenchHandlerServiceHandler@66dd04e2, + ,,true),null), + org.eclipse.ui.defaultAcceleratorConfiguration, + org.eclipse.ui.contexts.window,,,system) +Binding(ALT+SHIFT+R, + ParameterizedCommand(Command(org.eclipse.jdt.ui.edit.text.java.rename.element,Rename - Refactoring , + Rename the selected element, + Category(org.eclipse.jdt.ui.category.refactoring,Refactor - Java,Java Refactoring Actions,true), + org.eclipse.ui.internal.WorkbenchHandlerServiceHandler@495e8a3, + ,,true),null), + org.eclipse.ui.defaultAcceleratorConfiguration, + org.eclipse.ui.contexts.window,,,system) + +!ENTRY org.eclipse.egit.ui 2 0 2022-03-23 12:15:37.784 +!MESSAGE Warning: The environment variable HOME is not set. The following directory will be used to store the Git +user global configuration and to define the default location to store repositories: 'C:\Users\mario'. If this is +not correct please set the HOME environment variable and restart Eclipse. Otherwise Git for Windows and +EGit might behave differently since they see different configuration options. +This warning can be switched off on the Team > Git > Confirmations and Warnings preference page. diff --git a/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources b/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources index 949459b..85ece75 100644 Binary files a/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources and b/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources differ diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs index f0f7e13..8862f99 100644 --- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs +++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs @@ -1,90 +1,9 @@ -content_assist_completion_replacement_background=200,200,0 -content_assist_completion_replacement_foreground=200,0,0 content_assist_lru_history= content_assist_number_of_computers=13 -content_assist_parameters_background=52,57,61 -content_assist_parameters_foreground=238,238,238 -content_assist_proposals_background=52,57,61 -content_assist_proposals_foreground=238,238,238 eclipse.preferences.version=1 -java_bracket=249,250,244 -java_comment_task_tag=154,140,124 -java_default=217,232,247 -java_doc_default=128,128,128 -java_doc_keyword=154,140,124 -java_doc_link=169,156,140 -java_doc_tag=30,120,155 -java_keyword=204,108,29 -java_keyword_bold=false -java_keyword_return=204,108,29 -java_keyword_return_bold=false -java_multi_line_comment=128,128,128 -java_operator=230,230,250 -java_single_line_comment=128,128,128 -java_string=23,198,163 -matchingBracketsColor=249,250,244 org.eclipse.jdt.internal.ui.navigator.layout=2 org.eclipse.jdt.internal.ui.navigator.librariesnode=true org.eclipse.jdt.ui.formatterprofiles.version=22 -overriddenByCSS=,content_assist_completion_replacement_background,content_assist_completion_replacement_foreground,content_assist_parameters_background,content_assist_parameters_foreground,content_assist_proposals_background,content_assist_proposals_foreground,java_bracket,java_comment_task_tag,java_default,java_doc_default,java_doc_keyword,java_doc_link,java_doc_tag,java_keyword,java_keyword_bold,java_keyword_return,java_keyword_return_bold,java_multi_line_comment,java_operator,java_single_line_comment,java_string,matchingBracketsColor,pf_coloring_argument,pf_coloring_assignment,pf_coloring_comment,pf_coloring_key,pf_coloring_value,semanticHighlighting.abstractClass.color,semanticHighlighting.abstractClass.enabled,semanticHighlighting.abstractMethodInvocation.color,semanticHighlighting.abstractMethodInvocation.enabled,semanticHighlighting.annotation.color,semanticHighlighting.annotation.enabled,semanticHighlighting.annotation.italic,semanticHighlighting.annotationElementReference.color,semanticHighlighting.annotationElementReference.enabled,semanticHighlighting.class.color,semanticHighlighting.class.enabled,semanticHighlighting.deprecatedMember.color,semanticHighlighting.deprecatedMember.enabled,semanticHighlighting.deprecatedMember.underline,semanticHighlighting.deprecatedMember.strikethrough,semanticHighlighting.enum.color,semanticHighlighting.enum.enabled,semanticHighlighting.enum.italic,semanticHighlighting.field.color,semanticHighlighting.field.enabled,semanticHighlighting.inheritedField.color,semanticHighlighting.inheritedMethodInvocation.color,semanticHighlighting.inheritedMethodInvocation.enabled,semanticHighlighting.interface.color,semanticHighlighting.interface.enabled,semanticHighlighting.localVariable.color,semanticHighlighting.localVariable.enabled,semanticHighlighting.localVariableDeclaration.color,semanticHighlighting.localVariableDeclaration.enabled,semanticHighlighting.localVariableDeclaration.bold,semanticHighlighting.method.color,semanticHighlighting.method.enabled,semanticHighlighting.methodDeclarationName.color,semanticHighlighting.methodDeclarationName.enabled,semanticHighlighting.methodDeclarationName.bold,semanticHighlighting.number.color,semanticHighlighting.number.enabled,semanticHighlighting.parameterVariable.color,semanticHighlighting.parameterVariable.enabled,semanticHighlighting.staticField.color,semanticHighlighting.staticField.enabled,semanticHighlighting.staticFinalField.color,semanticHighlighting.staticFinalField.enabled,semanticHighlighting.staticMethodInvocation.color,semanticHighlighting.staticMethodInvocation.enabled,semanticHighlighting.typeArgument.color,semanticHighlighting.typeArgument.enabled,semanticHighlighting.typeParameter.color,semanticHighlighting.typeParameter.enabled,semanticHighlighting.typeParameter.bold,semanticHighlighting.restrictedKeywords.color,semanticHighlighting.restrictedKeywords.bold,sourceHoverBackgroundColor, -pf_coloring_argument=221,40,103 -pf_coloring_assignment=217,232,247 -pf_coloring_comment=128,128,128 -pf_coloring_key=217,232,247 -pf_coloring_value=23,198,163 -semanticHighlighting.abstractClass.color=62,171,230 -semanticHighlighting.abstractClass.enabled=true -semanticHighlighting.abstractMethodInvocation.color=128,246,167 -semanticHighlighting.abstractMethodInvocation.enabled=true -semanticHighlighting.annotation.color=160,160,160 -semanticHighlighting.annotation.enabled=true -semanticHighlighting.annotation.italic=true -semanticHighlighting.annotationElementReference.color=235,75,100 -semanticHighlighting.annotationElementReference.enabled=true -semanticHighlighting.class.color=18,144,195 -semanticHighlighting.class.enabled=true -semanticHighlighting.deprecatedMember.color=128,128,128 -semanticHighlighting.deprecatedMember.enabled=true -semanticHighlighting.deprecatedMember.strikethrough=true -semanticHighlighting.deprecatedMember.underline=false -semanticHighlighting.enum.color=204,129,186 -semanticHighlighting.enum.enabled=true -semanticHighlighting.enum.italic=true -semanticHighlighting.field.color=102,225,248 -semanticHighlighting.field.enabled=true -semanticHighlighting.inheritedField.color=143,143,191 -semanticHighlighting.inheritedMethodInvocation.color=205,246,104 -semanticHighlighting.inheritedMethodInvocation.enabled=true -semanticHighlighting.interface.color=128,242,246 -semanticHighlighting.interface.enabled=true -semanticHighlighting.localVariable.color=243,236,121 -semanticHighlighting.localVariable.enabled=true -semanticHighlighting.localVariableDeclaration.bold=false -semanticHighlighting.localVariableDeclaration.color=242,242,0 -semanticHighlighting.localVariableDeclaration.enabled=true -semanticHighlighting.method.color=167,236,33 -semanticHighlighting.method.enabled=true -semanticHighlighting.methodDeclarationName.bold=false -semanticHighlighting.methodDeclarationName.color=30,181,64 -semanticHighlighting.methodDeclarationName.enabled=true -semanticHighlighting.number.color=104,151,187 -semanticHighlighting.number.enabled=true -semanticHighlighting.parameterVariable.color=121,171,255 -semanticHighlighting.parameterVariable.enabled=true -semanticHighlighting.restrictedKeywords.bold=false -semanticHighlighting.restrictedKeywords.color=204,108,29 -semanticHighlighting.staticField.color=141,218,248 -semanticHighlighting.staticField.enabled=true -semanticHighlighting.staticFinalField.color=141,218,248 -semanticHighlighting.staticFinalField.enabled=true -semanticHighlighting.staticMethodInvocation.color=150,236,63 -semanticHighlighting.staticMethodInvocation.enabled=true -semanticHighlighting.typeArgument.color=177,102,218 -semanticHighlighting.typeArgument.enabled=true -semanticHighlighting.typeParameter.bold=false -semanticHighlighting.typeParameter.color=191,164,164 -semanticHighlighting.typeParameter.enabled=true -sourceHoverBackgroundColor=68,68,68 spelling_ignore_ampersand_in_properties=true spelling_ignore_digits=true spelling_ignore_java_strings=true diff --git a/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi b/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi index 84a58ee..9a69549 100644 --- a/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi +++ b/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi @@ -1,35 +1,30 @@ -<<<<<<< HEAD - - -======= - - ->>>>>>> aefdc99b447f4c2e53fc68e4066d71ca85feec2e + + activeSchemeId:org.eclipse.ui.defaultAcceleratorConfiguration - + - - + + topLevel shellMaximized - - - + + + + persp.actionSet:org.eclipse.ui.externaltools.ExternalToolsSet + persp.actionSet:org.eclipse.wb.core.ui.actionset persp.actionSet:org.eclipse.ui.cheatsheets.actionSet persp.actionSet:org.eclipse.search.searchActionSet persp.actionSet:org.eclipse.text.quicksearch.actionSet persp.actionSet:org.eclipse.ui.edit.text.actionSet.annotationNavigation persp.actionSet:org.eclipse.ui.edit.text.actionSet.navigation persp.actionSet:org.eclipse.ui.edit.text.actionSet.convertLineDelimitersTo - persp.actionSet:org.eclipse.ui.externaltools.ExternalToolsSet persp.actionSet:org.eclipse.ui.actionSet.keyBindings persp.actionSet:org.eclipse.ui.actionSet.openFiles - persp.actionSet:org.eclipse.wb.core.ui.actionset persp.actionSet:org.eclipse.debug.ui.launchActionSet persp.actionSet:org.eclipse.jdt.ui.JavaActionSet persp.actionSet:org.eclipse.jdt.ui.JavaElementCreationActionSet @@ -71,2889 +66,2261 @@ persp.showIn:org.eclipse.egit.ui.RepositoriesView persp.actionSet:org.eclipse.eclemma.ui.CoverageActionSet persp.showIn:org.eclipse.eclemma.ui.CoverageView - persp.viewSC:org.eclipse.tm.terminal.view.ui.TerminalsView - persp.showIn:org.eclipse.tm.terminal.view.ui.TerminalsView persp.viewSC:org.eclipse.wb.core.StructureView persp.viewSC:org.eclipse.wb.core.PaletteView + persp.viewSC:org.eclipse.tm.terminal.view.ui.TerminalsView + persp.showIn:org.eclipse.tm.terminal.view.ui.TerminalsView persp.newWizSC:org.eclipse.jdt.junit.wizards.NewTestCaseCreationWizard persp.actionSet:org.eclipse.jdt.junit.JUnitActionSet persp.viewSC:org.eclipse.ant.ui.views.AntView - persp.actionSet:org.eclipse.ui.edit.text.actionSet.presentation -<<<<<<< HEAD - - - + + + org.eclipse.e4.primaryNavigationStack - -======= - - - - org.eclipse.e4.primaryNavigationStack - active - ->>>>>>> aefdc99b447f4c2e53fc68e4066d71ca85feec2e + View categoryTag:Java - + View categoryTag:Java - + View categoryTag:General - + View categoryTag:WindowBuilder - + View categoryTag:WindowBuilder - + View categoryTag:Java - - + + View categoryTag:Git - - - - + + + + org.eclipse.e4.secondaryNavigationStack - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - + View categoryTag:Ant -<<<<<<< HEAD - -======= - ->>>>>>> aefdc99b447f4c2e53fc68e4066d71ca85feec2e + org.eclipse.e4.secondaryDataStack Gradle - General - + View categoryTag:General - + View categoryTag:Java - + View categoryTag:Java - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - + View categoryTag:Terminal - + View categoryTag:Gradle - + View categoryTag:Gradle - - View - categoryTag:General - - - View - categoryTag:General - - - - - - - - persp.actionSet:org.eclipse.ui.externaltools.ExternalToolsSet - persp.actionSet:org.eclipse.wb.core.ui.actionset - persp.actionSet:org.eclipse.ui.cheatsheets.actionSet - persp.actionSet:org.eclipse.search.searchActionSet - persp.actionSet:org.eclipse.text.quicksearch.actionSet - persp.actionSet:org.eclipse.ui.edit.text.actionSet.annotationNavigation - persp.actionSet:org.eclipse.ui.edit.text.actionSet.navigation - persp.actionSet:org.eclipse.ui.edit.text.actionSet.convertLineDelimitersTo - persp.actionSet:org.eclipse.ui.actionSet.keyBindings - persp.actionSet:org.eclipse.ui.actionSet.openFiles - persp.viewSC:org.eclipse.jdt.ui.PackageExplorer - persp.viewSC:org.eclipse.team.ui.GenericHistoryView - persp.viewSC:org.eclipse.team.sync.views.SynchronizeView - persp.viewSC:org.eclipse.egit.ui.StagingView - persp.viewSC:org.eclipse.egit.ui.ReflogView - persp.viewSC:org.eclipse.egit.ui.RepositoriesView - persp.perspSC:org.eclipse.ui.resourcePerspective - persp.perspSC:org.eclipse.team.ui.TeamSynchronizingPerspective - persp.actionSet:org.eclipse.egit.ui.navigation - persp.actionSet:org.eclipse.egit.ui.SearchActionSet - persp.newWizSC:org.eclipse.egit.ui.CreateRepositoryWizard - persp.showIn:org.eclipse.tm.terminal.view.ui.TerminalsView - - - - - View - categoryTag:Git - - - - - View - categoryTag:Java - - - - - - - - View - categoryTag:Version Control (Team) - - - View - categoryTag:Version Control (Team) - - - View - categoryTag:Git - - - View - categoryTag:Git - - - View - categoryTag:General - - - - - - - - persp.actionSet:org.eclipse.ui.externaltools.ExternalToolsSet - persp.actionSet:org.eclipse.wb.core.ui.actionset - persp.actionSet:org.eclipse.ui.cheatsheets.actionSet - persp.actionSet:org.eclipse.search.searchActionSet - persp.actionSet:org.eclipse.text.quicksearch.actionSet - persp.actionSet:org.eclipse.ui.edit.text.actionSet.annotationNavigation - persp.actionSet:org.eclipse.ui.edit.text.actionSet.navigation - persp.actionSet:org.eclipse.ui.edit.text.actionSet.convertLineDelimitersTo - persp.actionSet:org.eclipse.ui.actionSet.keyBindings - persp.actionSet:org.eclipse.ui.actionSet.openFiles - persp.viewSC:org.eclipse.ui.views.ProgressView - persp.viewSC:org.eclipse.ui.texteditor.TemplatesView - persp.actionSet:org.eclipse.debug.ui.launchActionSet - persp.actionSet:org.eclipse.debug.ui.debugActionSet - persp.actionSet:org.eclipse.ui.NavigateActionSet - persp.viewSC:org.eclipse.debug.ui.DebugView - persp.viewSC:org.eclipse.debug.ui.VariableView - persp.viewSC:org.eclipse.debug.ui.BreakpointView - persp.viewSC:org.eclipse.debug.ui.ExpressionView - persp.viewSC:org.eclipse.ui.views.ContentOutline - persp.viewSC:org.eclipse.ui.console.ConsoleView - persp.viewSC:org.eclipse.ui.views.ProblemView - persp.viewSC:org.eclipse.ui.navigator.ProjectExplorer - persp.viewSC:org.eclipse.pde.runtime.LogView - persp.actionSet:org.eclipse.debug.ui.breakpointActionSet - persp.perspSC:org.eclipse.jdt.ui.JavaPerspective - persp.perspSC:org.eclipse.jdt.ui.JavaBrowsingPerspective - persp.actionSet:org.eclipse.jdt.ui.JavaActionSet - persp.showIn:org.eclipse.jdt.ui.PackageExplorer - persp.actionSet:org.eclipse.jdt.debug.ui.JDTDebugActionSet - persp.viewSC:org.eclipse.jdt.debug.ui.DisplayView - persp.showIn:org.eclipse.egit.ui.RepositoriesView - persp.actionSet:org.eclipse.eclemma.ui.CoverageActionSet - persp.showIn:org.eclipse.eclemma.ui.CoverageView - persp.viewSC:org.eclipse.tm.terminal.view.ui.TerminalsView - persp.showIn:org.eclipse.tm.terminal.view.ui.TerminalsView - persp.viewSC:org.eclipse.jdt.junit.ResultView - persp.viewSC:org.eclipse.ant.ui.views.AntView - - - org.eclipse.e4.primaryNavigationStack - - View - categoryTag:Debug - - - View - categoryTag:General - - - View - categoryTag:Java - - - View - categoryTag:Java - - - View - categoryTag:Java - - - - - - - org.eclipse.e4.secondaryNavigationStack - - View - categoryTag:Debug - - - View - categoryTag:Debug - - - View - categoryTag:Debug - - - View - categoryTag:General - - - View - categoryTag:General - - - View - categoryTag:General - - - View - categoryTag:Ant - - - - - - View - categoryTag:General - - - View - categoryTag:General - - - View - categoryTag:Debug - - - View - categoryTag:General - - - View - categoryTag:General - - - View - categoryTag:General - - - View - categoryTag:Debug - - - View - categoryTag:General - - - View - categoryTag:Terminal - - - + + View categoryTag:Help - + View - categoryTag:General + categoryTag:Help - + View - categoryTag:Help + categoryTag:General - + + + + View + categoryTag:Help + + View categoryTag:Help - + - View categoryTag:General - - ViewMenu - menuContribution:menu - - - - - - - View - categoryTag:Help -<<<<<<< HEAD - - + + org.eclipse.e4.primaryDataStack EditorStack active - - + + Editor removeOnHide org.eclipse.jdt.ui.CompilationUnitEditor active + activeOnClose - - - Editor - removeOnHide - org.eclipse.jdt.ui.CompilationUnitEditor - - - - Editor - removeOnHide - org.eclipse.jdt.ui.CompilationUnitEditor - - - - Editor - removeOnHide - org.eclipse.jdt.ui.CompilationUnitEditor - -======= - - - org.eclipse.e4.primaryDataStack - EditorStack ->>>>>>> aefdc99b447f4c2e53fc68e4066d71ca85feec2e - + - + View categoryTag:Java - + ViewMenu menuContribution:menu - + - + View categoryTag:Java - + - View categoryTag:General -<<<<<<< HEAD - -======= - active - activeOnClose - ->>>>>>> aefdc99b447f4c2e53fc68e4066d71ca85feec2e - ViewMenu - menuContribution:menu - - - + -<<<<<<< HEAD - -======= - ->>>>>>> aefdc99b447f4c2e53fc68e4066d71ca85feec2e + View categoryTag:General - + ViewMenu menuContribution:menu - + - + View categoryTag:Java - + View categoryTag:Java - + View categoryTag:General - + View categoryTag:General - + ViewMenu menuContribution:menu - + - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - + ViewMenu menuContribution:menu - + - + View categoryTag:General - + View categoryTag:General - + - View categoryTag:Git - - ViewMenu - menuContribution:menu - - - - - - View - categoryTag:Terminal - - + View categoryTag:WindowBuilder - + View categoryTag:WindowBuilder - + + + + View + categoryTag:Terminal + + View categoryTag:Java - + View categoryTag:Ant - - + + View categoryTag:Gradle - + ViewMenu menuContribution:menu - + - - + + View categoryTag:Gradle - - ViewMenu - menuContribution:menu - - - - - - - - View - categoryTag:General - - ViewMenu - menuContribution:menu - - - - - - - - View - categoryTag:General - - ViewMenu - menuContribution:menu - - - - - - - - View - categoryTag:Version Control (Team) - - ViewMenu - menuContribution:menu - - - - - - - - View - categoryTag:Version Control (Team) - - ViewMenu - menuContribution:menu - - - - - - - - View - categoryTag:Git - - ViewMenu - menuContribution:menu - - - - - - - View - categoryTag:Git - - - - - - View - categoryTag:Debug - - ViewMenu - menuContribution:menu - - - - - - - View - categoryTag:Debug - - - - - - View - categoryTag:Debug - - ViewMenu - menuContribution:menu - - - - - - - - View - categoryTag:Debug - - ViewMenu - menuContribution:menu - - - - - - - - View - categoryTag:Debug - + ViewMenu menuContribution:menu - + - - - - - View - categoryTag:Debug - - ViewMenu - menuContribution:menu - - - - - + + toolbarSeparator - + - + Draggable -<<<<<<< HEAD - -======= - ->>>>>>> aefdc99b447f4c2e53fc68e4066d71ca85feec2e + - + toolbarSeparator - + - + Draggable - + toolbarSeparator - + - + Draggable - + Draggable - + Draggable - + Draggable - + toolbarSeparator - - - - Draggable - + - + Draggable -<<<<<<< HEAD -======= - + - - Draggable ->>>>>>> aefdc99b447f4c2e53fc68e4066d71ca85feec2e - - + toolbarSeparator - + - + toolbarSeparator - + - + Draggable - + stretch SHOW_RESTORE_MENU - + Draggable HIDEABLE SHOW_RESTORE_MENU - - + + stretch - + Draggable - + Draggable - - - TrimStack - Draggable - - - + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + platform:win32 - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + - - + + - - - - - - - + + + + + + + + + - - - - - + + + - - - + + + - - - - - + + + + + - - + + - - - - + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - + + - - + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - + + + - - + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - + + + + - - - + + + - - - + + - - - - - - - + + + + + + + - - - - + + + + - - - - - - + + + - - - + + + + + + - - - + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - + + - - - - + + + + - - + + - - + + - - - + + + - - + + - - + + platform:win32 - - - - - + + - - + + - - - - - - - - - - - - - - - - - - + + - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + - - - - - - - - + + + + + + + + - - - - - + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Editor removeOnHide - - - - View - categoryTag:Ant - - + View categoryTag:Gradle - + View categoryTag:Gradle - - - + + + View - categoryTag:Debug + categoryTag:Java - - - + View - categoryTag:Debug + categoryTag:Help - - - + + + View - categoryTag:Debug + categoryTag:Help - - - + + + View - categoryTag:Debug + categoryTag:General - - - + + + View - categoryTag:Debug + categoryTag:General - - - + + + View - categoryTag:Debug + categoryTag:General - - - + + + View - categoryTag:Debug + categoryTag:API Tools - - - + + + View - categoryTag:Java + categoryTag:Plug-in Development + + + + + View + categoryTag:Plug-in Development + + + + + View + categoryTag:Plug-in Development + + + + + View + categoryTag:Plug-in Development + + + + + View + categoryTag:Plug-in Development + + + + + View + categoryTag:Plug-in Development - + View categoryTag:Git - + View categoryTag:Git - + View categoryTag:Git - + View categoryTag:Git NoRestore - + View categoryTag:Git - + + + + View + categoryTag:WindowBuilder + + + + + View + categoryTag:WindowBuilder + + + + + View + categoryTag:Ant + + + + + View + categoryTag:Debug + + + + + View + categoryTag:Debug + + + + + View + categoryTag:Debug + + + + + View + categoryTag:Debug + + + + + View + categoryTag:Debug + + + + + View + categoryTag:Debug + + + + + View + categoryTag:Debug + + + View + categoryTag:Debug + + View categoryTag:Help - + View categoryTag:Debug - + View categoryTag:Java - + View categoryTag:Java - + View categoryTag:Java - + View categoryTag:Java Browsing - + View categoryTag:Java Browsing - + View categoryTag:Java Browsing - + View categoryTag:Java Browsing - + View categoryTag:Java - + View categoryTag:General - + View categoryTag:Java - + View categoryTag:Java - + View categoryTag:Maven - + + + + View + categoryTag:Maven + + View categoryTag:Maven - + View categoryTag:Oomph - + View categoryTag:General - + View categoryTag:Version Control (Team) - + View categoryTag:Version Control (Team) - - View - categoryTag:Help - - + View categoryTag:Terminal - + View categoryTag:Other - + View categoryTag:General - + View categoryTag:General - - - - View - categoryTag:Help - - - - - View - categoryTag:General - - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - - - - View - categoryTag:General - - - - - View - categoryTag:General - - + View categoryTag:General - + View categoryTag:General - - - - View - categoryTag:API Tools - - - - - View - categoryTag:Plug-in Development - - - - - View - categoryTag:Plug-in Development - - - - - View - categoryTag:Plug-in Development - - - - - View - categoryTag:Plug-in Development - - - - - View - categoryTag:Plug-in Development - - - - - View - categoryTag:Plug-in Development - - - - - View - categoryTag:WindowBuilder - - - - - View - categoryTag:WindowBuilder - - - View - categoryTag:Debug - - - - - View - categoryTag:Maven - - - + + glue move_after:PerspectiveSpacer SHOW_RESTORE_MENU - + move_after:Spacer Glue HIDEABLE SHOW_RESTORE_MENU - + glue move_after:SearchField SHOW_RESTORE_MENU - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + + - - - - + + + - - - - - - + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - + + + - - - - + + + - - - - + + + + + + - - - - - - - + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + -<<<<<<< HEAD - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -======= - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ->>>>>>> aefdc99b447f4c2e53fc68e4066d71ca85feec2e + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.metadata/.plugins/org.eclipse.jdt.core/1865797976.index b/.metadata/.plugins/org.eclipse.jdt.core/1865797976.index index 3721893..22c56f5 100644 Binary files a/.metadata/.plugins/org.eclipse.jdt.core/1865797976.index and b/.metadata/.plugins/org.eclipse.jdt.core/1865797976.index differ diff --git a/.metadata/.plugins/org.eclipse.jdt.core/externalFilesCache b/.metadata/.plugins/org.eclipse.jdt.core/externalFilesCache index c022a69..af3260a 100644 Binary files a/.metadata/.plugins/org.eclipse.jdt.core/externalFilesCache and b/.metadata/.plugins/org.eclipse.jdt.core/externalFilesCache differ diff --git a/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps b/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps index c6b8391..5f55b22 100644 Binary files a/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps and b/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps differ diff --git a/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt b/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt index ef9d294..7009c80 100644 --- a/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt +++ b/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt @@ -21,13 +21,7 @@ INDEX VERSION 1.131+C:\Users\mario\Documents\GitHub\MarioGabIFP\Super_Paco_Bros\ 3552531414.index 240943240.index 2251499996.index -<<<<<<< HEAD -1642175237.index 2574099473.index -4153573058.index -======= -2574099473.index ->>>>>>> aefdc99b447f4c2e53fc68e4066d71ca85feec2e 3103961500.index 3625172027.index 4153573058.index diff --git a/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml b/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml index 7c18c8b..7a80cfb 100644 --- a/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml +++ b/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml @@ -5,7 +5,7 @@ - +
@@ -13,47 +13,4 @@
-
-<<<<<<< HEAD - - -======= - - ->>>>>>> aefdc99b447f4c2e53fc68e4066d71ca85feec2e -
-
- - - - - -<<<<<<< HEAD - -
-
- -
-
- - -
- - - - - -
-
-
- -
-
- - -
-
-======= ->>>>>>> aefdc99b447f4c2e53fc68e4066d71ca85feec2e -
diff --git a/.metadata/.plugins/org.eclipse.m2e.logback.configuration/0.log b/.metadata/.plugins/org.eclipse.m2e.logback.configuration/0.log index eb075e5..6205a44 100644 --- a/.metadata/.plugins/org.eclipse.m2e.logback.configuration/0.log +++ b/.metadata/.plugins/org.eclipse.m2e.logback.configuration/0.log @@ -11,3 +11,4 @@ 2022-03-23 10:42:38,036 [Worker-8: Loading available Gradle versions] INFO o.e.b.c.i.u.g.PublishedGradleVersions - Gradle version information cache is out-of-date. Trying to update. ======= >>>>>>> aefdc99b447f4c2e53fc68e4066d71ca85feec2e +2022-03-23 12:15:37,865 [Worker-6: Loading available Gradle versions] INFO o.e.b.c.i.u.g.PublishedGradleVersions - Gradle version information cache is up-to-date. Trying to read. diff --git a/.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties b/.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties index 290e88d..a71142b 100644 --- a/.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties +++ b/.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties @@ -1,6 +1,2 @@ #Cached timestamps -<<<<<<< HEAD -#Wed Mar 23 10:27:35 CET 2022 -======= -#Wed Mar 23 06:42:39 CET 2022 ->>>>>>> aefdc99b447f4c2e53fc68e4066d71ca85feec2e +#Wed Mar 23 12:17:52 CET 2022 diff --git a/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml b/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml index 4b692d5..1c4761e 100644 --- a/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml +++ b/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml @@ -3,4 +3,5 @@ + \ No newline at end of file diff --git a/.metadata/version.ini b/.metadata/version.ini index e882722..577e920 100644 --- a/.metadata/version.ini +++ b/.metadata/version.ini @@ -1,7 +1,3 @@ -<<<<<<< HEAD -#Wed Mar 23 10:42:33 CET 2022 -======= -#Wed Mar 23 06:36:45 CET 2022 ->>>>>>> aefdc99b447f4c2e53fc68e4066d71ca85feec2e +#Wed Mar 23 12:15:31 CET 2022 org.eclipse.core.runtime=2 org.eclipse.platform=4.23.0.v20220308-0310 diff --git a/Game/core/src/com/paco/game/Graphics.java b/Game/core/src/com/paco/game/Graphics.java deleted file mode 100644 index d111d6d..0000000 --- a/Game/core/src/com/paco/game/Graphics.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.paco.game; - -import com.badlogic.gdx.ApplicationAdapter; -import com.badlogic.gdx.graphics.Texture; -import com.badlogic.gdx.graphics.g2d.SpriteBatch; -import com.badlogic.gdx.utils.ScreenUtils; - -public class Graphics extends ApplicationAdapter { - SpriteBatch batch; - Texture img; - - @Override - public void create () { - batch = new SpriteBatch(); - img = new Texture("cloud.png") { - @Override - public int getHeight() { - // TODO Auto-generated method stub - return 200; - } - - @Override - public int getWidth() { - // TODO Auto-generated method stub - return 400; - } - }; - } - - @Override - public void render () { - ScreenUtils.clear(0, 1, 1, 1); - batch.begin(); - batch.draw(img, 200, 800); - batch.draw(img, 800, 400); - batch.end(); - } - - @Override - public void dispose () { - batch.dispose(); - img.dispose(); - } -} diff --git a/Game/desktop/src/com/paco/game/DesktopLauncher.java b/Game/desktop/src/com/paco/game/DesktopLauncher.java index c32fde1..a48c014 100644 --- a/Game/desktop/src/com/paco/game/DesktopLauncher.java +++ b/Game/desktop/src/com/paco/game/DesktopLauncher.java @@ -12,10 +12,6 @@ public static void main (String[] arg) { Lwjgl3ApplicationConfiguration config = new Lwjgl3ApplicationConfiguration(); config.setFullscreenMode(Lwjgl3ApplicationConfiguration.getDisplayMode()); config.setForegroundFPS(60); -<<<<<<< HEAD new Lwjgl3Application(new Screen(), config); -======= - new Lwjgl3Application(new Graphics(), config); ->>>>>>> aefdc99b447f4c2e53fc68e4066d71ca85feec2e } }