Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • team13/tdat1006
  • eivindrt/tdat1006
  • alexholt/idatt1002
  • elinang/idatt1002
  • surya/idatt1002
  • kjellit/idata-1002-demo-project
  • eskillr/idatt1002
  • G1-06/idatt-1002-2022-1-06
  • emillaa/idatt1002
  • andreksv/idatt-1002-2023-9
  • melane/idatt-1002-2023-5
  • ramtinfs/idatt1002
  • surya/idatx1005
  • itatt1005_2024_group15/purchase-planner
  • systemutvikling-gruppe-19/idatt-1005-2024-group-19
15 results
Show changes
Hide whitespace changes
Inline Side-by-side
Showing
with 241 additions and 15 deletions
lib/junit-4.12.jar deleted 100644 → 0
View file @ 07ebfa20
File deleted
page/index.html 0 → 100644
View file @ b6d6198b
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Gitlab Page for my repository!</title>
</head>
<body>
<p><a href="https://surya.pages.stud.idi.ntnu.no/idatt1002/apidocs/">Java-docs</a></p>
<p><a href="https://surya.pages.stud.idi.ntnu.no/idatt1002/coverage-reports/index.html">Coverage reports</a></p>
</body>
</html>
\ No newline at end of file
pom.xml 0 → 100644
View file @ b6d6198b
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>no.ntnu.idatt1002.demo</groupId>
<artifactId>idatt2002demo</artifactId>
<version>1.0-SNAPSHOT</version>
<name>demo</name>
<packaging>jar</packaging>
<properties>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<junit.version>5.8.1</junit.version>
<javafx.version>17.0.1</javafx.version>
</properties>
<repositories>
<repository>
<id>jitpack.io</id>
<url>https://jitpack.io</url>
</repository>
</repositories>
<dependencies>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-controls</artifactId>
<version>${javafx.version}</version>
</dependency>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-fxml</artifactId>
<version>${javafx.version}</version>
</dependency>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-base</artifactId>
<version>${javafx.version}</version>
</dependency>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-graphics </artifactId>
<version>${javafx.version}</version>
</dependency>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-web</artifactId>
<version>11.0.2</version>
</dependency>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-media</artifactId>
<version>11.0.2</version>
</dependency>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-swing</artifactId>
<version>11.0.2</version>
</dependency>
<dependency>
<groupId>org.xerial</groupId>
<artifactId>sqlite-jdbc</artifactId>
<version>3.36.0.3</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.3.0</version>
</dependency>
<dependency>
<groupId>com.github.Dansoftowner</groupId>
<artifactId>jSystemThemeDetector</artifactId>
<version>3.8</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.36</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.7.36</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>17</source>
<target>17</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.4</version>
<executions>
<execution>
<id>default-jar</id>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M5</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<archive>
<manifest>
<mainClass>
no.ntnu.idatt1002.demo.MyApp
</mainClass>
</manifest>
</archive>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.openjfx</groupId>
<artifactId>javafx-maven-plugin</artifactId>
<version>0.0.8</version>
<executions>
<execution>
<!-- Default configuration for running with: mvn clean javafx:run -->
<id>default-cli</id>
<configuration>
<mainClass>no.ntnu.idatt1002.demo/no.ntnu.idatt1002.demo.MyApp</mainClass>
<launcher>app</launcher>
<jlinkZipName>app</jlinkZipName>
<jlinkImageName>app</jlinkImageName>
<noManPages>true</noManPages>
<stripDebug>true</stripDebug>
<noHeaderFiles>true</noHeaderFiles>
<release>${maven.compiler.target}</release>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.8</version>
<executions>
<execution>
<id>prepare-agent</id>
<goals><goal>prepare-agent</goal></goals>
</execution>
<execution>
<id>report</id>
<phase>test</phase>
<goals><goal>report</goal></goals>
<configuration>
<outputDirectory>${project.build.directory}/jacoco/coverage-reports/</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.5.0</version>
<configuration>
<show>private</show>
<nohelp>true</nohelp>
</configuration>
</plugin>
</plugins>
</build>
</project>
src/myapp/MyApp.java → src/main/java/no/ntnu/idatt1002/demo/MyApp.java
View file @ b6d6198b
package myapp;
package no.ntnu.idatt1002.demo;
import myapp.view.MyWindow;
import no.ntnu.idatt1002.demo.view.MyWindow;
/**
* Use this class to start the application
......
src/myapp/data/MyEntity.java → src/main/java/no/ntnu/idatt1002/demo/data/MyEntity.java
View file @ b6d6198b
package myapp.data;
package no.ntnu.idatt1002.demo.data;
import java.util.Date;
import java.util.List;
......
src/myapp/repo/MyEntityRepo.java → src/main/java/no/ntnu/idatt1002/demo/repo/MyEntityRepo.java
View file @ b6d6198b
package myapp.repo;
package no.ntnu.idatt1002.demo.repo;
import myapp.data.MyEntity;
import no.ntnu.idatt1002.demo.data.MyEntity;
import java.util.Arrays;
import java.util.List;
......
src/myapp/view/MyWindow.java → src/main/java/no/ntnu/idatt1002/demo/view/MyWindow.java
View file @ b6d6198b
package myapp.view;
package no.ntnu.idatt1002.demo.view;
import myapp.repo.MyEntityRepo;
import myapp.data.MyEntity;
import no.ntnu.idatt1002.demo.repo.MyEntityRepo;
import no.ntnu.idatt1002.demo.data.MyEntity;
import java.awt.GridLayout;
import java.awt.*;
import javax.swing.*;
/**
......@@ -17,7 +17,6 @@ public class MyWindow extends JFrame {
* Constructor for window
*
* @param title Title ow the window
* @return the image at the specified URL
* @see Image
*/
public MyWindow(String title) {
......
src/myapp/repo/MyEntityRepoTest.java → src/test/java/no/ntnu/idatt1002/demo/repo/MyEntityRepoTest.java
View file @ b6d6198b
package myapp.repo;
package no.ntnu.idatt1002.demo.repo;
import no.ntnu.idatt1002.demo.data.MyEntity;
import org.junit.jupiter.api.Test;
import myapp.data.MyEntity;
import org.junit.Test;
import static org.junit.Assert.*;
import static org.junit.jupiter.api.Assertions.assertEquals;
public class MyEntityRepoTest {
@Test
public void testThatWeCanReadMyEntityFromDatabase() {
MyEntity e = new MyEntityRepo().getMyEntity("id");
assertEquals(e.getName(), "name");
}
......