diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..bdb0cab --- /dev/null +++ b/.gitattributes @@ -0,0 +1,17 @@ +# Auto detect text files and perform LF normalization +* text=auto + +# Custom for Visual Studio +*.cs diff=csharp + +# Standard to msysgit +*.doc diff=astextplain +*.DOC diff=astextplain +*.docx diff=astextplain +*.DOCX diff=astextplain +*.dot diff=astextplain +*.DOT diff=astextplain +*.pdf diff=astextplain +*.PDF diff=astextplain +*.rtf diff=astextplain +*.RTF diff=astextplain diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f91ff2b --- /dev/null +++ b/.gitignore @@ -0,0 +1,216 @@ +################# +## Eclipse +################# + +*.pydevproject +.project +.metadata +bin/ +tmp/ +*.tmp +*.bak +*.swp +*~.nib +local.properties +.classpath +.settings/ +.loadpath + +# External tool builders +.externalToolBuilders/ + +# Locally stored "Eclipse launch configurations" +*.launch + +# CDT-specific +.cproject + +# PDT-specific +.buildpath + + +################# +## Visual Studio +################# + +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. + +# User-specific files +*.suo +*.user +*.sln.docstates + +# Build results + +[Dd]ebug/ +[Rr]elease/ +x64/ +build/ +[Bb]in/ +[Oo]bj/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +*_i.c +*_p.c +*.ilk +*.meta +*.obj +*.pch +*.pdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.log +*.scc + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opensdf +*.sdf +*.cachefile + +# Visual Studio profiler +*.psess +*.vsp +*.vspx + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# NCrunch +*.ncrunch* +.*crunch*.local.xml + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.Publish.xml +*.pubxml +*.publishproj + +# NuGet Packages Directory +## TODO: If you have NuGet Package Restore enabled, uncomment the next line +#packages/ + +# Windows Azure Build Output +csx +*.build.csdef + +# Windows Store app package directory +AppPackages/ + +# Others +sql/ +*.Cache +ClientBin/ +[Ss]tyle[Cc]op.* +~$* +*~ +*.dbmdl +*.[Pp]ublish.xml +*.pfx +*.publishsettings + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file to a newer +# Visual Studio version. Backup files are not needed, because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm + +# SQL Server files +App_Data/*.mdf +App_Data/*.ldf + +############# +## Windows detritus +############# + +# Windows image file caches +Thumbs.db +ehthumbs.db + +# Folder config file +Desktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Mac crap +.DS_Store + + +############# +## Python +############# + +*.py[cod] + +# Packages +*.egg +*.egg-info +dist/ +build/ +eggs/ +parts/ +var/ +sdist/ +develop-eggs/ +.installed.cfg + +# Installer logs +pip-log.txt + +# Unit test / coverage reports +.coverage +.tox + +#Translations +*.mo + +#Mr Developer +.mr.developer.cfg diff --git a/HelloWorld/.classpath b/HelloWorld/.classpath index 91ee9a5..fb565a5 100644 --- a/HelloWorld/.classpath +++ b/HelloWorld/.classpath @@ -1,6 +1,6 @@ - - - - - - + + + + + + diff --git a/HelloWorld/.project b/HelloWorld/.project index ac71c48..9152186 100644 --- a/HelloWorld/.project +++ b/HelloWorld/.project @@ -1,17 +1,17 @@ - - - HelloWorld - - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.core.javanature - - + + + HelloWorld + + + + + + org.eclipse.jdt.core.javabuilder + + + + + + org.eclipse.jdt.core.javanature + + diff --git a/HelloWorld/.settings/org.eclipse.jdt.core.prefs b/HelloWorld/.settings/org.eclipse.jdt.core.prefs index 838bd9d..7341ab1 100644 --- a/HelloWorld/.settings/org.eclipse.jdt.core.prefs +++ b/HelloWorld/.settings/org.eclipse.jdt.core.prefs @@ -1,11 +1,11 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.7 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.7 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/HelloWorld/bin/test2.class b/HelloWorld/bin/test2.class new file mode 100644 index 0000000..4f3a1ed Binary files /dev/null and b/HelloWorld/bin/test2.class differ diff --git a/HelloWorld/src/CopyOfHelloHej.java b/HelloWorld/src/CopyOfHelloHej.java index 7abbf6d..b172707 100644 --- a/HelloWorld/src/CopyOfHelloHej.java +++ b/HelloWorld/src/CopyOfHelloHej.java @@ -1,12 +1,12 @@ - -public class CopyOfHelloHej { - - /** - * @param args - */ - public static void main(String[] args) { - // TODO Auto-generated method stub - System.out.println("Hello hej world, dette er test 17 juni"); - } - -} + +public class CopyOfHelloHej { + + /** + * @param args + */ + public static void main(String[] args) { + // TODO Auto-generated method stub + System.out.println("Hello hej world, dette er test 17 juni"); + } + +} diff --git a/HelloWorld/src/HellloJava.java b/HelloWorld/src/HellloJava.java index 946964c..76b28f3 100644 --- a/HelloWorld/src/HellloJava.java +++ b/HelloWorld/src/HellloJava.java @@ -1,13 +1,13 @@ - -public class HellloJava { - - /** - * @param args - */ - public static void main(String[] args) { - // TODO Auto-generated method stub - System.out.println("hej world.......juni"); - - } - -} + +public class HellloJava { + + /** + * @param args + */ + public static void main(String[] args) { + // TODO Auto-generated method stub + System.out.println("hej world.......juni"); + + } + +} diff --git a/HelloWorld/src/HelloHej.java b/HelloWorld/src/HelloHej.java index 0217beb..79882c6 100644 --- a/HelloWorld/src/HelloHej.java +++ b/HelloWorld/src/HelloHej.java @@ -1,12 +1,12 @@ - -public class HelloHej { - - /** - * @param args - */ - public static void main(String[] args) { - // TODO Auto-generated method stub - System.out.println("Hello hej world, dette er test"); - } - -} + +public class HelloHej { + + /** + * @param args + */ + public static void main(String[] args) { + // TODO Auto-generated method stub + System.out.println("Hello hej world, dette er test"); + } + +} diff --git a/HelloWorld/src/classdiagram.png b/HelloWorld/src/classdiagram.png new file mode 100644 index 0000000..950dcb2 Binary files /dev/null and b/HelloWorld/src/classdiagram.png differ