diff --git a/.metadata/.lock b/.metadata/.lock new file mode 100644 index 000000000..e69de29bb diff --git a/.metadata/.log b/.metadata/.log new file mode 100644 index 000000000..0cb16378c --- /dev/null +++ b/.metadata/.log @@ -0,0 +1,211 @@ +!SESSION 2014-03-11 16:33:06.446 ----------------------------------------------- +eclipse.buildId=3.4.0.201304151603 +java.version=1.6.0_24 +java.vendor=Sun Microsystems Inc. +BootLoader constants: OS=win32, ARCH=x86, WS=win32, NL=zh_CN +Command-line arguments: -os win32 -ws win32 -arch x86 + +!ENTRY org.eclipse.equinox.p2.transport.ecf 2 0 2014-03-11 16:33:20.829 +!MESSAGE Connection to http://download.aptana.com/studio3-rcp/plugin/update/p2.index failed on download.aptana.com. Retry attempt 0 started +!STACK 0 +java.net.UnknownHostException: download.aptana.com + at java.net.PlainSocketImpl.connect(Unknown Source) + at java.net.SocksSocketImpl.connect(Unknown Source) + at java.net.Socket.connect(Unknown Source) + at org.eclipse.ecf.provider.filetransfer.events.socket.SocketEventCreateUtil.createSocket(SocketEventCreateUtil.java:43) + at org.eclipse.ecf.internal.provider.filetransfer.httpclient.ECFHttpClientProtocolSocketFactory.createSocket(ECFHttpClientProtocolSocketFactory.java:81) + at org.eclipse.ecf.internal.provider.filetransfer.httpclient.ECFHttpClientProtocolSocketFactory.createSocket(ECFHttpClientProtocolSocketFactory.java:73) + at org.eclipse.ecf.internal.provider.filetransfer.httpclient.ECFHttpClientProtocolSocketFactory.createSocket(ECFHttpClientProtocolSocketFactory.java:65) + at org.apache.commons.httpclient.HttpConnection.open(HttpConnection.java:707) + at org.apache.commons.httpclient.MultiThreadedHttpConnectionManager$HttpConnectionAdapter.open(MultiThreadedHttpConnectionManager.java:1361) + at org.apache.commons.httpclient.HttpMethodDirector.executeWithRetry(HttpMethodDirector.java:387) + at org.apache.commons.httpclient.HttpMethodDirector.executeMethod(HttpMethodDirector.java:171) + at org.apache.commons.httpclient.HttpClient.executeMethod(HttpClient.java:397) + at org.apache.commons.httpclient.HttpClient.executeMethod(HttpClient.java:346) + at org.eclipse.ecf.provider.filetransfer.httpclient.HttpClientRetrieveFileTransfer.performConnect(HttpClientRetrieveFileTransfer.java:1142) + at org.eclipse.ecf.provider.filetransfer.httpclient.HttpClientRetrieveFileTransfer.openStreams(HttpClientRetrieveFileTransfer.java:710) + at org.eclipse.ecf.provider.filetransfer.retrieve.AbstractRetrieveFileTransfer.sendRetrieveRequest(AbstractRetrieveFileTransfer.java:889) + at org.eclipse.ecf.provider.filetransfer.retrieve.AbstractRetrieveFileTransfer.sendRetrieveRequest(AbstractRetrieveFileTransfer.java:576) + at org.eclipse.ecf.provider.filetransfer.retrieve.MultiProtocolRetrieveAdapter.sendRetrieveRequest(MultiProtocolRetrieveAdapter.java:106) + at org.eclipse.equinox.internal.p2.transport.ecf.FileReader.sendRetrieveRequest(FileReader.java:349) + at org.eclipse.equinox.internal.p2.transport.ecf.FileReader.readInto(FileReader.java:295) + at org.eclipse.equinox.internal.p2.transport.ecf.RepositoryTransport.download(RepositoryTransport.java:87) + at org.eclipse.equinox.internal.p2.transport.ecf.RepositoryTransport.download(RepositoryTransport.java:137) + at org.eclipse.equinox.internal.p2.repository.helpers.AbstractRepositoryManager.loadIndexFile(AbstractRepositoryManager.java:721) + at org.eclipse.equinox.internal.p2.repository.helpers.AbstractRepositoryManager.loadRepository(AbstractRepositoryManager.java:640) + at org.eclipse.equinox.internal.p2.metadata.repository.MetadataRepositoryManager.loadRepository(MetadataRepositoryManager.java:96) + at org.eclipse.equinox.internal.p2.metadata.repository.MetadataRepositoryManager.loadRepository(MetadataRepositoryManager.java:92) + at org.eclipse.equinox.internal.p2.updatechecker.UpdateChecker.getAvailableRepositories(UpdateChecker.java:150) + at org.eclipse.equinox.internal.p2.updatechecker.UpdateChecker.checkForUpdates(UpdateChecker.java:128) + at org.eclipse.equinox.internal.p2.updatechecker.UpdateChecker$UpdateCheckThread.run(UpdateChecker.java:72) + +!ENTRY org.eclipse.equinox.p2.transport.ecf 4 1006 2014-03-11 16:33:21.110 +!MESSAGE Unknown Host: http://download.aptana.com/studio3-rcp/plugin/update/content.xml +!STACK 0 +java.net.UnknownHostException: download.aptana.com + at java.net.PlainSocketImpl.connect(Unknown Source) + at java.net.SocksSocketImpl.connect(Unknown Source) + at java.net.Socket.connect(Unknown Source) + at org.eclipse.ecf.provider.filetransfer.events.socket.SocketEventCreateUtil.createSocket(SocketEventCreateUtil.java:43) + at org.eclipse.ecf.internal.provider.filetransfer.httpclient.ECFHttpClientProtocolSocketFactory.createSocket(ECFHttpClientProtocolSocketFactory.java:81) + at org.eclipse.ecf.internal.provider.filetransfer.httpclient.ECFHttpClientProtocolSocketFactory.createSocket(ECFHttpClientProtocolSocketFactory.java:73) + at org.eclipse.ecf.internal.provider.filetransfer.httpclient.ECFHttpClientProtocolSocketFactory.createSocket(ECFHttpClientProtocolSocketFactory.java:65) + at org.apache.commons.httpclient.HttpConnection.open(HttpConnection.java:707) + at org.apache.commons.httpclient.MultiThreadedHttpConnectionManager$HttpConnectionAdapter.open(MultiThreadedHttpConnectionManager.java:1361) + at org.apache.commons.httpclient.HttpMethodDirector.executeWithRetry(HttpMethodDirector.java:387) + at org.apache.commons.httpclient.HttpMethodDirector.executeMethod(HttpMethodDirector.java:171) + at org.apache.commons.httpclient.HttpClient.executeMethod(HttpClient.java:397) + at org.apache.commons.httpclient.HttpClient.executeMethod(HttpClient.java:346) + at org.eclipse.ecf.provider.filetransfer.httpclient.HttpClientFileSystemBrowser.runRequest(HttpClientFileSystemBrowser.java:227) + at org.eclipse.ecf.provider.filetransfer.browse.AbstractFileSystemBrowser$DirectoryJob.run(AbstractFileSystemBrowser.java:69) + at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54) +!SESSION 2014-03-11 16:46:11.935 ----------------------------------------------- +eclipse.buildId=3.4.0.201304151603 +java.version=1.6.0_24 +java.vendor=Sun Microsystems Inc. +BootLoader constants: OS=win32, ARCH=x86, WS=win32, NL=zh_CN +Command-line arguments: -os win32 -ws win32 -arch x86 + +!ENTRY org.eclipse.equinox.p2.transport.ecf 2 0 2014-03-11 16:46:21.061 +!MESSAGE Connection to http://download.aptana.com/studio3-rcp/plugin/update/p2.index failed on download.aptana.com. Retry attempt 0 started +!STACK 0 +java.net.UnknownHostException: download.aptana.com + at java.net.PlainSocketImpl.connect(Unknown Source) + at java.net.SocksSocketImpl.connect(Unknown Source) + at java.net.Socket.connect(Unknown Source) + at org.eclipse.ecf.provider.filetransfer.events.socket.SocketEventCreateUtil.createSocket(SocketEventCreateUtil.java:43) + at org.eclipse.ecf.internal.provider.filetransfer.httpclient.ECFHttpClientProtocolSocketFactory.createSocket(ECFHttpClientProtocolSocketFactory.java:81) + at org.eclipse.ecf.internal.provider.filetransfer.httpclient.ECFHttpClientProtocolSocketFactory.createSocket(ECFHttpClientProtocolSocketFactory.java:73) + at org.eclipse.ecf.internal.provider.filetransfer.httpclient.ECFHttpClientProtocolSocketFactory.createSocket(ECFHttpClientProtocolSocketFactory.java:65) + at org.apache.commons.httpclient.HttpConnection.open(HttpConnection.java:707) + at org.apache.commons.httpclient.MultiThreadedHttpConnectionManager$HttpConnectionAdapter.open(MultiThreadedHttpConnectionManager.java:1361) + at org.apache.commons.httpclient.HttpMethodDirector.executeWithRetry(HttpMethodDirector.java:387) + at org.apache.commons.httpclient.HttpMethodDirector.executeMethod(HttpMethodDirector.java:171) + at org.apache.commons.httpclient.HttpClient.executeMethod(HttpClient.java:397) + at org.apache.commons.httpclient.HttpClient.executeMethod(HttpClient.java:346) + at org.eclipse.ecf.provider.filetransfer.httpclient.HttpClientRetrieveFileTransfer.performConnect(HttpClientRetrieveFileTransfer.java:1142) + at org.eclipse.ecf.provider.filetransfer.httpclient.HttpClientRetrieveFileTransfer.openStreams(HttpClientRetrieveFileTransfer.java:710) + at org.eclipse.ecf.provider.filetransfer.retrieve.AbstractRetrieveFileTransfer.sendRetrieveRequest(AbstractRetrieveFileTransfer.java:889) + at org.eclipse.ecf.provider.filetransfer.retrieve.AbstractRetrieveFileTransfer.sendRetrieveRequest(AbstractRetrieveFileTransfer.java:576) + at org.eclipse.ecf.provider.filetransfer.retrieve.MultiProtocolRetrieveAdapter.sendRetrieveRequest(MultiProtocolRetrieveAdapter.java:106) + at org.eclipse.equinox.internal.p2.transport.ecf.FileReader.sendRetrieveRequest(FileReader.java:349) + at org.eclipse.equinox.internal.p2.transport.ecf.FileReader.readInto(FileReader.java:295) + at org.eclipse.equinox.internal.p2.transport.ecf.RepositoryTransport.download(RepositoryTransport.java:87) + at org.eclipse.equinox.internal.p2.transport.ecf.RepositoryTransport.download(RepositoryTransport.java:137) + at org.eclipse.equinox.internal.p2.repository.helpers.AbstractRepositoryManager.loadIndexFile(AbstractRepositoryManager.java:721) + at org.eclipse.equinox.internal.p2.repository.helpers.AbstractRepositoryManager.loadRepository(AbstractRepositoryManager.java:640) + at org.eclipse.equinox.internal.p2.metadata.repository.MetadataRepositoryManager.loadRepository(MetadataRepositoryManager.java:96) + at org.eclipse.equinox.internal.p2.metadata.repository.MetadataRepositoryManager.loadRepository(MetadataRepositoryManager.java:92) + at org.eclipse.equinox.internal.p2.updatechecker.UpdateChecker.getAvailableRepositories(UpdateChecker.java:150) + at org.eclipse.equinox.internal.p2.updatechecker.UpdateChecker.checkForUpdates(UpdateChecker.java:128) + at org.eclipse.equinox.internal.p2.updatechecker.UpdateChecker$UpdateCheckThread.run(UpdateChecker.java:72) + +!ENTRY org.eclipse.equinox.p2.transport.ecf 4 1006 2014-03-11 16:46:21.311 +!MESSAGE Unknown Host: http://download.aptana.com/studio3-rcp/plugin/update/content.xml +!STACK 0 +java.net.UnknownHostException: download.aptana.com + at java.net.PlainSocketImpl.connect(Unknown Source) + at java.net.SocksSocketImpl.connect(Unknown Source) + at java.net.Socket.connect(Unknown Source) + at org.eclipse.ecf.provider.filetransfer.events.socket.SocketEventCreateUtil.createSocket(SocketEventCreateUtil.java:43) + at org.eclipse.ecf.internal.provider.filetransfer.httpclient.ECFHttpClientProtocolSocketFactory.createSocket(ECFHttpClientProtocolSocketFactory.java:81) + at org.eclipse.ecf.internal.provider.filetransfer.httpclient.ECFHttpClientProtocolSocketFactory.createSocket(ECFHttpClientProtocolSocketFactory.java:73) + at org.eclipse.ecf.internal.provider.filetransfer.httpclient.ECFHttpClientProtocolSocketFactory.createSocket(ECFHttpClientProtocolSocketFactory.java:65) + at org.apache.commons.httpclient.HttpConnection.open(HttpConnection.java:707) + at org.apache.commons.httpclient.MultiThreadedHttpConnectionManager$HttpConnectionAdapter.open(MultiThreadedHttpConnectionManager.java:1361) + at org.apache.commons.httpclient.HttpMethodDirector.executeWithRetry(HttpMethodDirector.java:387) + at org.apache.commons.httpclient.HttpMethodDirector.executeMethod(HttpMethodDirector.java:171) + at org.apache.commons.httpclient.HttpClient.executeMethod(HttpClient.java:397) + at org.apache.commons.httpclient.HttpClient.executeMethod(HttpClient.java:346) + at org.eclipse.ecf.provider.filetransfer.httpclient.HttpClientFileSystemBrowser.runRequest(HttpClientFileSystemBrowser.java:227) + at org.eclipse.ecf.provider.filetransfer.browse.AbstractFileSystemBrowser$DirectoryJob.run(AbstractFileSystemBrowser.java:69) + at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54) + +!ENTRY org.eclipse.core.resources 4 1 2014-03-11 16:49:31.442 +!MESSAGE Problems occurred while refreshing local changes +!SUBENTRY 1 org.eclipse.core.resources 4 1 2014-03-11 16:49:31.442 +!MESSAGE Problems occurred while refreshing local changes +!STACK 1 +org.eclipse.core.internal.resources.ResourceException: Errors occurred while refreshing resources with the local file system. + at org.eclipse.core.internal.localstore.FileSystemResourceManager.refreshResource(FileSystemResourceManager.java:923) + at org.eclipse.core.internal.localstore.FileSystemResourceManager.refresh(FileSystemResourceManager.java:904) + at org.eclipse.core.internal.resources.Resource.refreshLocal(Resource.java:1663) + at org.eclipse.core.internal.refresh.RefreshJob.runInWorkspace(RefreshJob.java:167) + at org.eclipse.core.internal.resources.InternalWorkspaceJob.run(InternalWorkspaceJob.java:38) + at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54) +Contains: The project description file (.project) for 'trustie2' is missing. This file contains important information about the project. The project will not function properly until this file is restored. +!SUBENTRY 2 org.eclipse.core.resources 4 271 2014-03-11 16:49:31.442 +!MESSAGE Errors occurred while refreshing resources with the local file system. +!SUBENTRY 3 org.eclipse.core.resources 4 567 2014-03-11 16:49:31.442 +!MESSAGE The project description file (.project) for 'trustie2' is missing. This file contains important information about the project. The project will not function properly until this file is restored. + +!ENTRY com.aptana.ruby.core 4 0 2014-03-11 17:05:47.412 +!MESSAGE (eval):1: Use RbConfig instead of obsolete and deprecated Config. +(eval):1: warning: variable $= is no longer effective +(eval):1: warning: variable $KCODE is no longer effective +(eval):1: warning: variable $KCODE is no longer effective +D:/Users/nudt/AppData/Local/Aptana Studio 3/configuration/org.eclipse.osgi/bundles/93/1/.cp/ruby/core_stubber.rb:180:in `eval': Permission denied - E:\code\trustie\trustie2\.metadata\.plugins\com.aptana.ruby.core\1184073882\4 (Errno::EACCES) + from D:/Users/nudt/AppData/Local/Aptana Studio 3/configuration/org.eclipse.osgi/bundles/93/1/.cp/ruby/core_stubber.rb:180:in `eval' + from D:/Users/nudt/AppData/Local/Aptana Studio 3/configuration/org.eclipse.osgi/bundles/93/1/.cp/ruby/core_stubber.rb:180:in `block (3 levels) in
' + from D:/Users/nudt/AppData/Local/Aptana Studio 3/configuration/org.eclipse.osgi/bundles/93/1/.cp/ruby/core_stubber.rb:179:in `each' + from D:/Users/nudt/AppData/Local/Aptana Studio 3/configuration/org.eclipse.osgi/bundles/93/1/.cp/ruby/core_stubber.rb:179:in `block (2 levels) in
' + from D:/Users/nudt/AppData/Local/Aptana Studio 3/configuration/org.eclipse.osgi/bundles/93/1/.cp/ruby/core_stubber.rb:178:in `open' + from D:/Users/nudt/AppData/Local/Aptana Studio 3/configuration/org.eclipse.osgi/bundles/93/1/.cp/ruby/core_stubber.rb:178:in `block in
' + from D:/Users/nudt/AppData/Local/Aptana Studio 3/configuration/org.eclipse.osgi/bundles/93/1/.cp/ruby/core_stubber.rb:152:in `each' + from D:/Users/nudt/AppData/Local/Aptana Studio 3/configuration/org.eclipse.osgi/bundles/93/1/.cp/ruby/core_stubber.rb:152:in `
' + + +!ENTRY com.aptana.ruby.core 4 0 2014-03-11 17:05:50.704 +!MESSAGE (Build 3.4.0.201304151603) [ERROR] Not supported yet. +!STACK 0 +java.lang.UnsupportedOperationException: Not supported yet. + at org.jrubyparser.ast.LambdaNode.accept(LambdaNode.java:58) + at com.aptana.ruby.core.ast.AbstractVisitor.acceptNode(AbstractVisitor.java:37) + at com.aptana.ruby.core.ast.InOrderVisitor.visitHashNode(InOrderVisitor.java:414) + at org.jrubyparser.ast.HashNode.accept(HashNode.java:57) + at com.aptana.ruby.core.ast.AbstractVisitor.acceptNode(AbstractVisitor.java:37) + at com.aptana.ruby.core.ast.InOrderVisitor.visitCallNode(InOrderVisitor.java:193) + at com.aptana.ruby.core.ast.SourceElementVisitor.visitCallNode(SourceElementVisitor.java:230) + at org.jrubyparser.ast.CallNode.accept(CallNode.java:70) + at com.aptana.ruby.core.ast.AbstractVisitor.acceptNode(AbstractVisitor.java:53) + at com.aptana.ruby.core.ast.InOrderVisitor.visitLocalAsgnNode(InOrderVisitor.java:456) + at com.aptana.ruby.core.ast.SourceElementVisitor.visitLocalAsgnNode(SourceElementVisitor.java:839) + at org.jrubyparser.ast.LocalAsgnNode.accept(LocalAsgnNode.java:62) + at com.aptana.ruby.core.ast.AbstractVisitor.acceptNode(AbstractVisitor.java:53) + at com.aptana.ruby.core.ast.InOrderVisitor.visitIfNode(InOrderVisitor.java:438) + at org.jrubyparser.ast.IfNode.accept(IfNode.java:65) + at com.aptana.ruby.core.ast.AbstractVisitor.acceptNode(AbstractVisitor.java:53) + at com.aptana.ruby.core.ast.InOrderVisitor.visitNewlineNode(InOrderVisitor.java:525) + at org.jrubyparser.ast.NewlineNode.accept(NewlineNode.java:67) + at com.aptana.ruby.core.ast.AbstractVisitor.acceptNode(AbstractVisitor.java:37) + at com.aptana.ruby.core.ast.InOrderVisitor.visitDefnNode(InOrderVisitor.java:299) + at com.aptana.ruby.core.ast.SourceElementVisitor.visitDefnNode(SourceElementVisitor.java:346) + at org.jrubyparser.ast.DefnNode.accept(DefnNode.java:51) + at com.aptana.ruby.core.ast.AbstractVisitor.acceptNode(AbstractVisitor.java:53) + at com.aptana.ruby.core.ast.InOrderVisitor.visitNewlineNode(InOrderVisitor.java:525) + at org.jrubyparser.ast.NewlineNode.accept(NewlineNode.java:67) + at com.aptana.ruby.core.ast.AbstractVisitor.acceptNode(AbstractVisitor.java:37) + at com.aptana.ruby.core.ast.InOrderVisitor.visitClassNode(InOrderVisitor.java:213) + at com.aptana.ruby.core.ast.SourceElementVisitor.visitClassNode(SourceElementVisitor.java:260) + at org.jrubyparser.ast.ClassNode.accept(ClassNode.java:68) + at com.aptana.ruby.core.ast.AbstractVisitor.acceptNode(AbstractVisitor.java:53) + at com.aptana.ruby.core.ast.InOrderVisitor.visitNewlineNode(InOrderVisitor.java:525) + at org.jrubyparser.ast.NewlineNode.accept(NewlineNode.java:67) + at com.aptana.ruby.core.ast.AbstractVisitor.acceptNode(AbstractVisitor.java:37) + at com.aptana.ruby.core.ast.InOrderVisitor.visitModuleNode(InOrderVisitor.java:517) + at com.aptana.ruby.core.ast.SourceElementVisitor.visitModuleNode(SourceElementVisitor.java:824) + at org.jrubyparser.ast.ModuleNode.accept(ModuleNode.java:66) + at com.aptana.ruby.core.ast.AbstractVisitor.acceptNode(AbstractVisitor.java:53) + at com.aptana.ruby.core.ast.InOrderVisitor.visitNewlineNode(InOrderVisitor.java:525) + at org.jrubyparser.ast.NewlineNode.accept(NewlineNode.java:67) + at com.aptana.ruby.core.ast.AbstractVisitor.acceptNode(AbstractVisitor.java:37) + at com.aptana.ruby.core.ast.InOrderVisitor.visitRootNode(InOrderVisitor.java:668) + at com.aptana.ruby.core.ast.SourceElementVisitor.visitRootNode(SourceElementVisitor.java:848) + at org.jrubyparser.ast.RootNode.accept(RootNode.java:84) + at com.aptana.ruby.core.ast.AbstractVisitor.acceptNode(AbstractVisitor.java:53) + at com.aptana.ruby.internal.core.index.RubyFileIndexingParticipant.indexAST(RubyFileIndexingParticipant.java:73) + at com.aptana.ruby.internal.core.index.RubyFileIndexingParticipant.indexSource(RubyFileIndexingParticipant.java:61) + at com.aptana.ruby.internal.core.index.RubyFileIndexingParticipant.index(RubyFileIndexingParticipant.java:37) + at com.aptana.index.core.IndexRequestJob.indexFileStores(IndexRequestJob.java:205) + at com.aptana.index.core.IndexContainerJob.run(IndexContainerJob.java:114) + at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54) diff --git a/.metadata/.plugins/com.aptana.core.io/connections.9 b/.metadata/.plugins/com.aptana.core.io/connections.9 new file mode 100644 index 000000000..4371c4759 --- /dev/null +++ b/.metadata/.plugins/com.aptana.core.io/connections.9 @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/.metadata/.plugins/com.aptana.index.core/2874248206.index b/.metadata/.plugins/com.aptana.index.core/2874248206.index new file mode 100644 index 000000000..2200403a8 Binary files /dev/null and b/.metadata/.plugins/com.aptana.index.core/2874248206.index differ diff --git a/.metadata/.plugins/com.aptana.index.core/2924452064.index b/.metadata/.plugins/com.aptana.index.core/2924452064.index new file mode 100644 index 000000000..982acfcbc Binary files /dev/null and b/.metadata/.plugins/com.aptana.index.core/2924452064.index differ diff --git a/.metadata/.plugins/com.aptana.index.core/3084350319.index b/.metadata/.plugins/com.aptana.index.core/3084350319.index new file mode 100644 index 000000000..bac4484c7 Binary files /dev/null and b/.metadata/.plugins/com.aptana.index.core/3084350319.index differ diff --git a/.metadata/.plugins/com.aptana.index.core/3380472453.index b/.metadata/.plugins/com.aptana.index.core/3380472453.index new file mode 100644 index 000000000..bac4484c7 Binary files /dev/null and b/.metadata/.plugins/com.aptana.index.core/3380472453.index differ diff --git a/.metadata/.plugins/com.aptana.index.core/3406049957.index b/.metadata/.plugins/com.aptana.index.core/3406049957.index new file mode 100644 index 000000000..70530b4a9 Binary files /dev/null and b/.metadata/.plugins/com.aptana.index.core/3406049957.index differ diff --git a/.metadata/.plugins/com.aptana.index.core/4010369919.index b/.metadata/.plugins/com.aptana.index.core/4010369919.index new file mode 100644 index 000000000..e2902378c Binary files /dev/null and b/.metadata/.plugins/com.aptana.index.core/4010369919.index differ diff --git a/.metadata/.plugins/com.aptana.index.core/645869811.index b/.metadata/.plugins/com.aptana.index.core/645869811.index new file mode 100644 index 000000000..28be99cab Binary files /dev/null and b/.metadata/.plugins/com.aptana.index.core/645869811.index differ diff --git a/.metadata/.plugins/com.aptana.projects/dialog_settings.xml b/.metadata/.plugins/com.aptana.projects/dialog_settings.xml new file mode 100644 index 000000000..1c46e88dd --- /dev/null +++ b/.metadata/.plugins/com.aptana.projects/dialog_settings.xml @@ -0,0 +1,5 @@ + +
+
+
+
diff --git a/.metadata/.plugins/com.aptana.ruby.core/1184073882/4/argumenterror.rb b/.metadata/.plugins/com.aptana.ruby.core/1184073882/4/argumenterror.rb new file mode 100644 index 000000000..5ad22a1c4 --- /dev/null +++ b/.metadata/.plugins/com.aptana.ruby.core/1184073882/4/argumenterror.rb @@ -0,0 +1,11 @@ +class ArgumentError < StandardError + + + + + protected + + + private + +end diff --git a/.metadata/.plugins/com.aptana.ruby.core/1184073882/4/constants.rb b/.metadata/.plugins/com.aptana.ruby.core/1184073882/4/constants.rb new file mode 100644 index 000000000..7205e3807 --- /dev/null +++ b/.metadata/.plugins/com.aptana.ruby.core/1184073882/4/constants.rb @@ -0,0 +1,13 @@ +ARGV = [] +TRUE = true +FALSE = false +STDOUT = IO.new +STDIN = IO.new +STDERR = IO.new +ENV = {} +NIL = nil +RUBY_PATCHLEVEL = 392 +RUBY_COPYRIGHT = 'ruby - Copyright (C) 1993-2013 Yukihiro Matsumoto' +TOPLEVEL_BINDING = Binding.new +RUBY_VERSION = '1.9.3' +RUBY_PLATFORM = 'i386-mingw32' diff --git a/.metadata/.plugins/com.aptana.ruby.core/1184073882/4/globals.rb b/.metadata/.plugins/com.aptana.ruby.core/1184073882/4/globals.rb new file mode 100644 index 000000000..3e49c73b6 --- /dev/null +++ b/.metadata/.plugins/com.aptana.ruby.core/1184073882/4/globals.rb @@ -0,0 +1,24 @@ +$; = nil +$-F = nil +$@ = nil +$! = nil +$SAFE = 0 +$~ = nil +$& = nil +$` = nil +$' = nil +$+ = nil +$= = false +$KCODE = nil +$-K = nil +$, = nil +$/ = "\n" +$-0 = "\n" +$\ = nil +$_ = nil +$stdin = IO.new +$stdout = IO.new +$stderr = IO.new +$> = IO.new +$< = ARGF +$. = 0 diff --git a/.metadata/.plugins/com.aptana.ruby.ui/dialog_settings.xml b/.metadata/.plugins/com.aptana.ruby.ui/dialog_settings.xml new file mode 100644 index 000000000..80f900fa3 --- /dev/null +++ b/.metadata/.plugins/com.aptana.ruby.ui/dialog_settings.xml @@ -0,0 +1,6 @@ + +
+
+ +
+
diff --git a/.metadata/.plugins/com.aptana.syncing.core/defaultConnection.9 b/.metadata/.plugins/com.aptana.syncing.core/defaultConnection.9 new file mode 100644 index 000000000..375897785 --- /dev/null +++ b/.metadata/.plugins/com.aptana.syncing.core/defaultConnection.9 @@ -0,0 +1,7 @@ + + + +Default +file:/C:/Users/nudt + + \ No newline at end of file diff --git a/.metadata/.plugins/com.aptana.syncing.core/sites.9 b/.metadata/.plugins/com.aptana.syncing.core/sites.9 new file mode 100644 index 000000000..d9b475695 --- /dev/null +++ b/.metadata/.plugins/com.aptana.syncing.core/sites.9 @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/.metadata/.plugins/com.aptana.webserver.core/webservers.8 b/.metadata/.plugins/com.aptana.webserver.core/webservers.8 new file mode 100644 index 000000000..5c07542b1 --- /dev/null +++ b/.metadata/.plugins/com.aptana.webserver.core/webservers.8 @@ -0,0 +1,6 @@ + + + +demo + + \ No newline at end of file diff --git a/.metadata/.plugins/org.eclipse.core.resources/.projects/demo/.location b/.metadata/.plugins/org.eclipse.core.resources/.projects/demo/.location new file mode 100644 index 000000000..6592acc5b Binary files /dev/null and b/.metadata/.plugins/org.eclipse.core.resources/.projects/demo/.location differ diff --git a/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/history.version b/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/history.version new file mode 100644 index 000000000..25cb955ba --- /dev/null +++ b/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/history.version @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index b/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index new file mode 100644 index 000000000..fddafcbcd Binary files /dev/null and b/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index differ diff --git a/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.version b/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.version new file mode 100644 index 000000000..6b2aaa764 --- /dev/null +++ b/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.version @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/.metadata/.plugins/org.eclipse.core.resources/.root/2.tree b/.metadata/.plugins/org.eclipse.core.resources/.root/2.tree new file mode 100644 index 000000000..5b2529389 Binary files /dev/null and b/.metadata/.plugins/org.eclipse.core.resources/.root/2.tree differ diff --git a/.metadata/.plugins/org.eclipse.core.resources/.safetable/com.aptana.core.io.9 b/.metadata/.plugins/org.eclipse.core.resources/.safetable/com.aptana.core.io.9 new file mode 100644 index 000000000..0b4ef3b47 --- /dev/null +++ b/.metadata/.plugins/org.eclipse.core.resources/.safetable/com.aptana.core.io.9 @@ -0,0 +1,3 @@ +#safe table +#Tue Mar 11 17:27:27 CST 2014 +connections=connections.9 diff --git a/.metadata/.plugins/org.eclipse.core.resources/.safetable/com.aptana.syncing.core.9 b/.metadata/.plugins/org.eclipse.core.resources/.safetable/com.aptana.syncing.core.9 new file mode 100644 index 000000000..371e94161 --- /dev/null +++ b/.metadata/.plugins/org.eclipse.core.resources/.safetable/com.aptana.syncing.core.9 @@ -0,0 +1,4 @@ +#safe table +#Tue Mar 11 17:27:27 CST 2014 +defaultConnection=defaultConnection.9 +sites=sites.9 diff --git a/.metadata/.plugins/org.eclipse.core.resources/.safetable/com.aptana.webserver.core.8 b/.metadata/.plugins/org.eclipse.core.resources/.safetable/com.aptana.webserver.core.8 new file mode 100644 index 000000000..1af4b85d6 --- /dev/null +++ b/.metadata/.plugins/org.eclipse.core.resources/.safetable/com.aptana.webserver.core.8 @@ -0,0 +1,3 @@ +#safe table +#Tue Mar 11 17:27:27 CST 2014 +webservers=webservers.8 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 new file mode 100644 index 000000000..b3b591e28 Binary files /dev/null and b/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources differ diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/com.aptana.editor.common.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/com.aptana.editor.common.prefs new file mode 100644 index 000000000..050277123 --- /dev/null +++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/com.aptana.editor.common.prefs @@ -0,0 +1,15 @@ +AbstractTextEditor.Color.Background=20,20,20 +AbstractTextEditor.Color.Background.SystemDefault=false +AbstractTextEditor.Color.Foreground=248,248,248 +AbstractTextEditor.Color.Foreground.SystemDefault=false +AbstractTextEditor.Color.SelectionForeground=248,248,248 +AbstractTextEditor.Color.SelectionForeground.SystemDefault=false +CONFLICTING_COLOR=66,14,9 +INCOMING_COLOR=235,235,235 +OUTGOING_COLOR=235,235,235 +RESOLVED_COLOR=37,59,34 +additionIndicationColor=37,59,34 +changeIndicationColor=37,59,34 +currentLineColor=27,27,27 +deletionIndicationColor=66,14,9 +eclipse.preferences.version=1 diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/com.aptana.explorer.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/com.aptana.explorer.prefs new file mode 100644 index 000000000..752d73cf4 --- /dev/null +++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/com.aptana.explorer.prefs @@ -0,0 +1,2 @@ +activeProject=demo +eclipse.preferences.version=1 diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/com.aptana.js.core.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/com.aptana.js.core.prefs new file mode 100644 index 000000000..8611f3f02 --- /dev/null +++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/com.aptana.js.core.prefs @@ -0,0 +1,2 @@ +JS_INDEX_VERSION=0.36 +eclipse.preferences.version=1 diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/com.aptana.portal.ui.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/com.aptana.portal.ui.prefs new file mode 100644 index 000000000..a710d7ff4 --- /dev/null +++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/com.aptana.portal.ui.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +last_known_studio_version=3.4.0.1358388620 diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/com.aptana.rcp.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/com.aptana.rcp.prefs new file mode 100644 index 000000000..72b561e6a --- /dev/null +++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/com.aptana.rcp.prefs @@ -0,0 +1,3 @@ +EDITOR_LINE_NUMBER_SET=true +WORKSPACE_ENCODING_SET=true +eclipse.preferences.version=1 diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/com.aptana.ruby.core.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/com.aptana.ruby.core.prefs new file mode 100644 index 000000000..82f86f837 --- /dev/null +++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/com.aptana.ruby.core.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +index_version=5 diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/com.aptana.theme.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/com.aptana.theme.prefs new file mode 100644 index 000000000..590c84632 --- /dev/null +++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/com.aptana.theme.prefs @@ -0,0 +1,8 @@ +ACTIVE_HYPERLINK_COLOR=84,143,160 +ACTIVE_THEME=Aptana Studio +HYPERLINK_COLOR=84,143,160 +THEME_CHANGED=1394527579080 +eclipse.preferences.version=1 +hyperlinkColor=84,143,160 +hyperlinkColor.SystemDefault=false +themes/Aptana\ Studio=I1R1ZSBNYXIgMTEgMTY6MzM6MTkgQ1NUIDIwMTQNCm5hbWU9QXB0YW5hIFN0dWRpbw0Kc2VsZWN0aW9uPVwjZGRmMGZmMzMNCmxpbmVIaWdobGlnaHQ9XCNmZmZmZmYwOA0KZm9yZWdyb3VuZD1cI2Y4ZjhmOA0KYmFja2dyb3VuZD1cIzE0MTQxNA0KY2FyZXQ9XCNhN2E3YTcNCi1Db21tb24tPV5kb250Lm1hdGNoDQotLUNvbnNvbGUtLT1eZG9udC5tYXRjaA0KY29uc29sZS5lcnJvcj1cI2ZmMDAwMGZmXmNvbnNvbGUuZXJyb3INCmNvbnNvbGUuaW5wdXQ9XCM1ZmFmYjBmZl5jb25zb2xlLmlucHV0DQpjb25zb2xlLnByb21wdD1cIzgzODRhMWZmXmNvbnNvbGUucHJvbXB0DQpjb25zb2xlLndhcm5pbmc9XCNmZmQ3MDBmZl5jb25zb2xlLndhcm5pbmcNCmNvbnNvbGUuZGVidWc9XCNmZmVjOGJmZl5jb25zb2xlLmRlYnVnDQpoeXBlcmxpbms9XCM1NDhmYTBmZl5oeXBlcmxpbmsNCi0tTWlzYy4tLT1eZG9udC5tYXRjaA0KVW5zdGFnZWRcIGZpbGVzPVwjZjhmOGY4ZmYsXCM0MjBlMDlmZl5tYXJrdXAuZGVsZXRlZA0KU3RhZ2VkXCBmaWxlcz1cI2Y4ZjhmOGZmLFwjMjUzYjIyZmZebWFya3VwLmluc2VydGVkDQptYXJrdXAuY2hhbmdlZD1cI2Y4ZjhmOGZmLFwjNGE0MTBkZmZebWFya3VwLmNoYW5nZWQNCm1hcmt1cC51bmRlcmxpbmU9dW5kZXJsaW5lXm1hcmt1cC51bmRlcmxpbmUNCm1hcmt1cC5ib2xkPWJvbGRebWFya3VwLmJvbGQNCm1hcmt1cC5pdGFsaWM9aXRhbGljXm1hcmt1cC5pdGFsaWMNCm1ldGEuZGlmZixcIG1ldGEuZGlmZi5oZWFkZXI9XCNmOGY4ZjhmZixcIzBlMjIzMWZmLGl0YWxpY15tZXRhLmRpZmYsIG1ldGEuZGlmZi5oZWFkZXINCm1ldGEuc2VwYXJhdG9yLmRpZmY9XCNmZmZmZmZmZixcIzM0NjdkMWZmLGl0YWxpY15tZXRhLnNlcGFyYXRvci5kaWZmDQptZXRhLnNlcGFyYXRvcj1cI2ZmZmZmZmZmLFwjMzQ2N2QxZmZebWV0YS5zZXBhcmF0b3INCnByb3BlcnR5PVwjODc5YWI1ZmZecHJvcGVydHkNCi1UaGVtZVwgU3BlY2lmaWMtPV5kb250Lm1hdGNoDQppbnZpc2libGVzPVwjZmZmZmZmNDBeaW52aXNpYmxlcw0KQ29tbWVudD1cIzVmNWE2MGZmLGl0YWxpY15jb21tZW50DQpDb25zdGFudD1cI2NmNmE0Y2ZmXmNvbnN0YW50DQpFbnRpdHk9XCM5YjcwM2ZmZl5lbnRpdHkNCktleXdvcmQ9XCNjZGE4NjlmZl5rZXl3b3JkDQpTdG9yYWdlPVwjZjllZTk4ZmZec3RvcmFnZQ0KU3RyaW5nPVwjOGY5ZDZhZmZec3RyaW5nDQpTdXBwb3J0PVwjOWI4NTlkZmZec3VwcG9ydA0KVmFyaWFibGU9XCM3NTg3YTZmZl52YXJpYWJsZQ0KSW52YWxpZFwgXHUyMDEzXCBEZXByZWNhdGVkPVwjZDJhOGExZmYsaXRhbGljLHVuZGVybGluZV5pbnZhbGlkLmRlcHJlY2F0ZWQNCkludmFsaWRcIFx1MjAxM1wgSWxsZWdhbD1cI2Y4ZjhmOGZmLFwjNTYyZDU2YmZeaW52YWxpZC5pbGxlZ2FsDQpcdTI2NjZcIEVtYmVkZGVkXCBTb3VyY2U9XCNmOGY4ZjhmZixcI2IwYjNiYTE0XnRleHQgc291cmNlDQpcdTI2NjZcIEVtYmVkZGVkXCBTb3VyY2VcIChCcmlnaHQpPVwjZjhmOGY4ZmYsXCNiMWIzYmEyMV50ZXh0Lmh0bWwucnVieSBzb3VyY2UNClx1MjY2NlwgRW50aXR5XCBpbmhlcml0ZWQtY2xhc3M9XCM5YjVjMmVmZixpdGFsaWNeZW50aXR5Lm90aGVyLmluaGVyaXRlZC1jbGFzcw0KXHUyNjY2XCBTdHJpbmdcIGVtYmVkZGVkLXNvdXJjZT1cI2RhZWZhM2ZmXnN0cmluZyBzb3VyY2UNClx1MjY2NlwgU3RyaW5nXCBjb25zdGFudD1cI2RkZjJhNGZmXnN0cmluZyBjb25zdGFudA0KXHUyNjY2XCBTdHJpbmcucmVnZXhwPVwjZTljMDYyZmZec3RyaW5nLnJlZ2V4cA0KXHUyNjY2XCBTdHJpbmcucmVnZXhwLlx1MDBBQnNwZWNpYWxcdTAwQkI9XCNjZjdkMzRmZl5zdHJpbmcucmVnZXhwIGNvbnN0YW50LmNoYXJhY3Rlci5lc2NhcGUsIHN0cmluZy5yZWdleHAgc291cmNlLnJ1YnkuZW1iZWRkZWQsIHN0cmluZy5yZWdleHAgc3RyaW5nLnJlZ2V4cC5hcmJpdHJhcnktcmVwaXRpdGlvbg0KXHUyNjY2XCBTdHJpbmdcIHZhcmlhYmxlPVwjOGE5YTk1ZmZec3RyaW5nIHZhcmlhYmxlDQpcdTI2NjZcIFN1cHBvcnQuZnVuY3Rpb249XCNkYWQwODVmZl5zdXBwb3J0LmZ1bmN0aW9uDQpcdTI2NjZcIFN1cHBvcnQuY29uc3RhbnQ9XCNjZjZhNGNmZl5zdXBwb3J0LmNvbnN0YW50DQpjXCBDL0MrK1wgUHJlcHJvY2Vzc29yXCBMaW5lPVwjODk5NmE4ZmZebWV0YS5wcmVwcm9jZXNzb3IuYw0KY1wgQy9DKytcIFByZXByb2Nlc3NvclwgRGlyZWN0aXZlPVwjYWZjNGRiZmZebWV0YS5wcmVwcm9jZXNzb3IuYyBrZXl3b3JkDQpcdTI3MThcIERvY3R5cGUvWE1MXCBQcm9jZXNzaW5nPVwjNDk0OTQ5ZmZebWV0YS50YWcuc2dtbC5kb2N0eXBlLCBtZXRhLnRhZy5zZ21sLmRvY3R5cGUgZW50aXR5LCBtZXRhLnRhZy5zZ21sLmRvY3R5cGUgc3RyaW5nLCBtZXRhLnRhZy5wcmVwcm9jZXNzb3IueG1sLCBtZXRhLnRhZy5wcmVwcm9jZXNzb3IueG1sIGVudGl0eSwgbWV0YS50YWcucHJlcHJvY2Vzc29yLnhtbCBzdHJpbmcNClx1MjcxOFwgTWV0YS50YWcuXHUwMEFCYWxsXHUwMEJCPVwjYWM4ODViZmZeZGVjbGFyYXRpb24udGFnLCBkZWNsYXJhdGlvbi50YWcgZW50aXR5LCBtZXRhLnRhZywgbWV0YS50YWcgZW50aXR5DQpcdTI3MThcIE1ldGEudGFnLmlubGluZT1cI2UwYzU4OWZmXmRlY2xhcmF0aW9uLnRhZy5pbmxpbmUsIGRlY2xhcmF0aW9uLnRhZy5pbmxpbmUgZW50aXR5LCBzb3VyY2UgZW50aXR5Lm5hbWUudGFnLCBzb3VyY2UgZW50aXR5Lm90aGVyLmF0dHJpYnV0ZS1uYW1lLCBtZXRhLnRhZy5pbmxpbmUsIG1ldGEudGFnLmlubGluZSBlbnRpdHkNClx1MDBBN1wgY3NzXCB0YWctbmFtZT1cI2NkYTg2OWZmXm1ldGEuc2VsZWN0b3IuY3NzIGVudGl0eS5uYW1lLnRhZw0KXHUwMEE3XCBjc3NcOnBzZXVkby1jbGFzcz1cIzhmOWQ2YWZmXm1ldGEuc2VsZWN0b3IuY3NzIGVudGl0eS5vdGhlci5hdHRyaWJ1dGUtbmFtZS50YWcucHNldWRvLWNsYXNzDQpcdTAwQTdcIGNzc1wjaWQ9XCM4Yjk4YWJmZl5tZXRhLnNlbGVjdG9yLmNzcyBlbnRpdHkub3RoZXIuYXR0cmlidXRlLW5hbWUuaWQNClx1MDBBN1wgY3NzLmNsYXNzPVwjOWI3MDNmZmZebWV0YS5zZWxlY3Rvci5jc3MgZW50aXR5Lm90aGVyLmF0dHJpYnV0ZS1uYW1lLmNsYXNzDQpcdTAwQTdcIGNzc1wgcHJvcGVydHktbmFtZVw6PVwjYzVhZjc1ZmZec3VwcG9ydC50eXBlLnByb3BlcnR5LW5hbWUuY3NzDQpcdTAwQTdcIGNzc1wgcHJvcGVydHktdmFsdWU7PVwjZjllZTk4ZmZebWV0YS5wcm9wZXJ0eS1ncm91cCBzdXBwb3J0LmNvbnN0YW50LnByb3BlcnR5LXZhbHVlLmNzcywgbWV0YS5wcm9wZXJ0eS12YWx1ZSBzdXBwb3J0LmNvbnN0YW50LnByb3BlcnR5LXZhbHVlLmNzcw0KXHUwMEE3XCBjc3NcIEBhdC1ydWxlPVwjODY5M2E1ZmZebWV0YS5wcmVwcm9jZXNzb3IuYXQtcnVsZSBrZXl3b3JkLmNvbnRyb2wuYXQtcnVsZQ0KXHUwMEE3XCBjc3NcIGFkZGl0aW9uYWwtY29uc3RhbnRzPVwjY2E3ODQwZmZebWV0YS5wcm9wZXJ0eS12YWx1ZSBzdXBwb3J0LmNvbnN0YW50Lm5hbWVkLWNvbG9yLmNzcywgbWV0YS5wcm9wZXJ0eS12YWx1ZSBjb25zdGFudA0KXHUwMEE3XCBjc3NcIGNvbnN0cnVjdG9yLmFyZ3VtZW50PVwjOGY5ZDZhZmZebWV0YS5jb25zdHJ1Y3Rvci5hcmd1bWVudC5jc3MNClx1MjM4N1wgZGlmZi5oZWFkZXI9XCNmOGY4ZjhmZixcIzBlMjIzMWZmLGl0YWxpY15tZXRhLmRpZmYsIG1ldGEuZGlmZi5oZWFkZXIsIG1ldGEuc2VwYXJhdG9yDQpcdTIzODdcIGRpZmYuZGVsZXRlZD1cI2Y4ZjhmOGZmLFwjNDIwZTA5ZmZebWFya3VwLmRlbGV0ZWQNClx1MjM4N1wgZGlmZi5jaGFuZ2VkPVwjZjhmOGY4ZmYsXCM0YTQxMGRmZl5tYXJrdXAuY2hhbmdlZA0KXHUyMzg3XCBkaWZmLmluc2VydGVkPVwjZjhmOGY4ZmYsXCMyNTNiMjJmZl5tYXJrdXAuaW5zZXJ0ZWQNClBIUFwgdmFyaWFibGVcIGluc2lkZVwgc3RyaW5nPVwjMWNmNjE1ZmYsXCMwMDAwMDBmZl5tZXRhLnN0cmluZy1jb250ZW50cy5xdW90ZWQuZG91YmxlLnBocCB2YXJpYWJsZS5vdGhlci5waHANCk1hcmt1cFw6XCBMaXN0PVwjZjllZTk4ZmZebWFya3VwLmxpc3QNCk1hcmt1cFw6XCBIZWFkaW5nPVwjY2Y2YTRjZmZebWFya3VwLmhlYWRpbmcNCkFubm90YXRpb25cIE92ZXJyaWRlXCAtXCBzZWFyY2hSZXN1bHRJbmRpY2F0aW9uPV5vdmVycmlkZS5zZWFyY2hSZXN1bHRJbmRpY2F0aW9uDQpBbm5vdGF0aW9uXCBPdmVycmlkZVwgLVwgeG1sVGFnUGFpck9jY3VycmVuY2VJbmRpY2F0aW9uPV5vdmVycmlkZS54bWxUYWdQYWlyT2NjdXJyZW5jZUluZGljYXRpb24NCkFubm90YXRpb25cIE92ZXJyaWRlXCAtXCBodG1sVGFnUGFpck9jY3VycmVuY2VJbmRpY2F0aW9uPV5vdmVycmlkZS5odG1sVGFnUGFpck9jY3VycmVuY2VJbmRpY2F0aW9uDQpBbm5vdGF0aW9uXCBPdmVycmlkZVwgLVwgcnVieUJsb2NrUGFpck9jY3VycmVuY2VJbmRpY2F0aW9uPV5vdmVycmlkZS5ydWJ5QmxvY2tQYWlyT2NjdXJyZW5jZUluZGljYXRpb24NCkFubm90YXRpb25cIE92ZXJyaWRlXCAtXCBweWRldk9jY3VycmVuY2VJbmRpY2F0aW9uPV5vdmVycmlkZS5weWRldk9jY3VycmVuY2VJbmRpY2F0aW9uDQo\= diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/com.aptana.ui.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/com.aptana.ui.prefs new file mode 100644 index 000000000..c7ec58f2d --- /dev/null +++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/com.aptana.ui.prefs @@ -0,0 +1,3 @@ +IDEHasLaunchedBefore=true +PerspectiveVersion=103 +eclipse.preferences.version=1 diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..f8c207078 --- /dev/null +++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,4 @@ +eclipse.preferences.version=1 +encoding=UTF-8 +refresh.enabled=true +version=1 diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.debug.ui.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.debug.ui.prefs new file mode 100644 index 000000000..455f3abba --- /dev/null +++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.debug.ui.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.debug.ui.PREF_CHANGED_VALUE_BACKGROUND=74,65,13 +org.eclipse.debug.ui.PREF_LAUNCH_PERSPECTIVES=\r\n\r\n +org.eclipse.debug.ui.consoleBackground=20,20,20 +org.eclipse.debug.ui.errorColor=255,0,0 +org.eclipse.debug.ui.inColor=95,175,176 +org.eclipse.debug.ui.outColor=248,248,248 diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.search.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.search.prefs new file mode 100644 index 000000000..f3bbade48 --- /dev/null +++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.search.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +org.eclipse.search.potentialMatch.fgColor=94,101,105 diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.browser.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.browser.prefs new file mode 100644 index 000000000..5fe466c23 --- /dev/null +++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.browser.prefs @@ -0,0 +1,2 @@ +browsers=\r\n\r\n\r\n\r\n +eclipse.preferences.version=1 diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.editors.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.editors.prefs new file mode 100644 index 000000000..dd8cefcee --- /dev/null +++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.editors.prefs @@ -0,0 +1,40 @@ +AbstractTextEditor.Color.Background=20,20,20 +AbstractTextEditor.Color.Background.SystemDefault=false +AbstractTextEditor.Color.Foreground=248,248,248 +AbstractTextEditor.Color.Foreground.SystemDefault=false +AbstractTextEditor.Color.SelectionBackground=60,64,67 +AbstractTextEditor.Color.SelectionBackground.SystemDefault=false +AbstractTextEditor.Color.SelectionForeground=248,248,248 +AbstractTextEditor.Color.SelectionForeground.SystemDefault=false +CONFLICTING_COLOR=66,14,9 +INCOMING_COLOR=235,235,235 +OUTGOING_COLOR=235,235,235 +OccurrenceIndicationColor=94,101,105 +RESOLVED_COLOR=37,59,34 +additionIndicationColor=37,59,34 +changeIndicationColor=37,59,34 +currentIPColor=14,34,49 +currentLineColor=27,27,27 +deletionIndicationColor=66,14,9 +eclipse.preferences.version=1 +htmlTagPairOccurrenceIndication=true +htmlTagPairOccurrenceIndicationColor=94,94,94 +htmlTagPairOccurrenceIndicationHighlighting=false +htmlTagPairOccurrenceIndicationTextStyle=BOX +lineNumberRuler=true +occurrenceIndicationColor=60,64,67 +pydevOccurrenceHighlighting=false +pydevOccurrenceIndication=true +pydevOccurrenceIndicationColor=94,94,94 +pydevOccurrenceIndicationTextStyle=BOX +rubyBlockPairOccurrenceIndication=true +rubyBlockPairOccurrenceIndicationColor=94,94,94 +rubyBlockPairOccurrenceIndicationHighlighting=false +rubyBlockPairOccurrenceIndicationTextStyle=BOX +searchResultIndicationColor=94,101,105 +secondaryIPColor=14,34,49 +writeOccurrenceIndicationColor=60,64,67 +xmlTagPairOccurrenceIndication=true +xmlTagPairOccurrenceIndicationColor=94,94,94 +xmlTagPairOccurrenceIndicationHighlighting=false +xmlTagPairOccurrenceIndicationTextStyle=BOX diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs new file mode 100644 index 000000000..71a846af6 --- /dev/null +++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs @@ -0,0 +1,7 @@ +PROBLEMS_FILTERS_MIGRATE=true +SHOW_COOLBAR=true +SHOW_PERSPECTIVEBAR=true +eclipse.preferences.version=1 +platformState=1394526372425 +quickStart=false +tipsAndTricks=true diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.texteditor.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.texteditor.prefs new file mode 100644 index 000000000..e9b8648bf --- /dev/null +++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.texteditor.prefs @@ -0,0 +1,9 @@ +AbstractTextEditor.Color.Background=20,20,20 +AbstractTextEditor.Color.Background.SystemDefault=false +AbstractTextEditor.Color.Foreground=248,248,248 +AbstractTextEditor.Color.Foreground.SystemDefault=false +AbstractTextEditor.Color.SelectionBackground=60,64,67 +AbstractTextEditor.Color.SelectionForeground=248,248,248 +AbstractTextEditor.Color.SelectionForeground.SystemDefault=false +currentLineColor=27,27,27 +eclipse.preferences.version=1 diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.workbench.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.workbench.prefs new file mode 100644 index 000000000..34c35fec1 --- /dev/null +++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.workbench.prefs @@ -0,0 +1,21 @@ +ACTIVE_HYPERLINK_COLOR=84,143,160 +HYPERLINK_COLOR=84,143,160 +com.vectrace.mercurialeclipse.ui.colorsandfonts.IgnoredBackgroundColor=20,20,20 +com.vectrace.mercurialeclipse.ui.colorsandfonts.IgnoredForegroundColor=248,248,248 +com.vectrace.mercurialeclipse.ui.colorsandfonts.addedBackgroundColor=37,59,34 +com.vectrace.mercurialeclipse.ui.colorsandfonts.addedForegroundColor=248,248,248 +com.vectrace.mercurialeclipse.ui.colorsandfonts.changedBackgroundColor=74,65,13 +com.vectrace.mercurialeclipse.ui.colorsandfonts.changedForegroundColor=248,248,248 +com.vectrace.mercurialeclipse.ui.colorsandfonts.conflictBackgroundColor=20,20,20 +com.vectrace.mercurialeclipse.ui.colorsandfonts.conflictForegroundColor=248,248,248 +com.vectrace.mercurialeclipse.ui.colorsandfonts.deletedBackgroundColor=66,14,9 +com.vectrace.mercurialeclipse.ui.colorsandfonts.deletedForegroundColor=248,248,248 +com.vectrace.mercurialeclipse.ui.colorsandfonts.removedBackgroundColor=66,14,9 +com.vectrace.mercurialeclipse.ui.colorsandfonts.removedForegroundColor=248,248,248 +com.vectrace.mercurialeclipse.ui.colorsandfonts.unknownBackgroundColor=20,20,20 +com.vectrace.mercurialeclipse.ui.colorsandfonts.unknownForegroundColor=248,248,248 +eclipse.preferences.version=1 +hyperlinkColor=84,143,160 +hyperlinkColor.SystemDefault=false +org.eclipse.egit.ui.UncommittedChangeBackgroundColor=37,59,34 +org.eclipse.egit.ui.UncommittedChangeForegroundColor=248,248,248 diff --git a/.metadata/.plugins/org.eclipse.debug.core/.launches/Firefox - Internal Server.launch b/.metadata/.plugins/org.eclipse.debug.core/.launches/Firefox - Internal Server.launch new file mode 100644 index 000000000..f21eed9f2 --- /dev/null +++ b/.metadata/.plugins/org.eclipse.debug.core/.launches/Firefox - Internal Server.launch @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/.metadata/.plugins/org.eclipse.debug.core/.launches/Internet Explorer - Internal Server.launch b/.metadata/.plugins/org.eclipse.debug.core/.launches/Internet Explorer - Internal Server.launch new file mode 100644 index 000000000..2134fa92c --- /dev/null +++ b/.metadata/.plugins/org.eclipse.debug.core/.launches/Internet Explorer - Internal Server.launch @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml b/.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml new file mode 100644 index 000000000..2636d060e --- /dev/null +++ b/.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml b/.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml new file mode 100644 index 000000000..4868ecd96 --- /dev/null +++ b/.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml @@ -0,0 +1,14 @@ + +
+ + + + + + + + + + + +
diff --git a/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml b/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml new file mode 100644 index 000000000..f7e4d66f0 --- /dev/null +++ b/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml @@ -0,0 +1,10 @@ + +
+
+ + + + + +
+
diff --git a/.metadata/.plugins/org.eclipse.ui.workbench/workbench.xml b/.metadata/.plugins/org.eclipse.ui.workbench/workbench.xml new file mode 100644 index 000000000..88eaacee1 --- /dev/null +++ b/.metadata/.plugins/org.eclipse.ui.workbench/workbench.xml @@ -0,0 +1,202 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +demo +E:\code\demo + + + + + + + +Terminal +C:\Users\nudt + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml b/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml new file mode 100644 index 000000000..5a9aef845 --- /dev/null +++ b/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/.metadata/version.ini b/.metadata/version.ini new file mode 100644 index 000000000..c51ff745b --- /dev/null +++ b/.metadata/version.ini @@ -0,0 +1 @@ +org.eclipse.core.runtime=1 \ No newline at end of file diff --git a/app/controllers/contests_controller.rb b/app/controllers/contests_controller.rb index 5511b15ca..0f16a81c6 100644 --- a/app/controllers/contests_controller.rb +++ b/app/controllers/contests_controller.rb @@ -137,6 +137,20 @@ class ContestsController < ApplicationController end end + # Added by Longjun + def destroy_contest + @contest = Contest.find(params[:id]) + if @contest.author_id == User.current.id + + @contest.destroy + redirect_to action: 'index' + else + render_403 :message => :notice_not_contest_delete_authorized + end + + end + # end + def show_contest_project contests = Contest.where('parent_id = ?', @contest.id) @projects = [] diff --git a/app/views/layouts/base_newcontest.html.erb b/app/views/layouts/base_newcontest.html.erb index 9813905ca..ba78cefea 100644 --- a/app/views/layouts/base_newcontest.html.erb +++ b/app/views/layouts/base_newcontest.html.erb @@ -99,11 +99,14 @@ <%=link_to "#{@contest.contesting_softapplications.count}", :controller => 'contests', :action => 'show_softapplication' %> - + + + <%= l(:label_participate) %> <%= l(:label_contest_project) %> - <%= l(:label_contest_application) %> + <%= l(:label_contest_application) %> +
@@ -142,6 +145,13 @@
<%= l(:label_create_time) %>：<%= format_time(@contest.created_on) %>
+ <% if User.current.logged? %> + <% if @contest.author.id == User.current.id %> +
+ <%= link_to '删除', {:controller => 'contests', :action => 'destroy_contest', :id => @contest}, data: { confirm: '你确定要删除该竞赛吗?' } %> +
+ <% end %> + <% end %>
diff --git a/app/views/projects/files_tags.html.erb b/app/views/projects/files_tags.html.erb new file mode 100644 index 000000000..f451a59f5 --- /dev/null +++ b/app/views/projects/files_tags.html.erb @@ -0,0 +1,26 @@ + + + + +<% content_for :content do %> +
+

<%= l(:label_tags_search_result) %>

+
+ <%= l(:label_tags_numbers) %> + <%= l(:label_issue_plural) %>(<%= @issues_tags_num %>) | + <%= l(:label_project_plural) %>(<%= @projects_tags_num %>) | + <%= l(:label_user_plural) %>(<%= @users_tags_num %>) | + <%= l(:label_tags_call)%>(<%= @bids_tags_num %>) | + <%= l(:field_filename)%>(<%= @attachments_tags_num %>) +
+
+ <%# 求工厂模式重构 %> + <%= render :partial => "tag_search_results",:locals => {:issues_results => @issues_results, + :projects_results => @projects_results,:users_results => @users_results , + :bids_results=>@bids_results,:forums_results => @forums_results, :attachments_results => @attachments_results, :show_flag => @obj_flag}%> +
+ +
+ +<% end %> \ No newline at end of file diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 5cc7b7d8d..4bcb23731 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -170,6 +170,7 @@ zh: notice_locking_conflict: 数据已被另一位用户更新 notice_not_authorized: 对不起，您无权访问此页面。 notice_not_contest_setting_authorized: 对不起，您无权配置此竞赛。 + notice_not_contest_delete_authorized: 对不起，您无权删除此竞赛。 notice_not_authorized_archived_project: 要访问的项目已经归档。 notice_email_sent: "邮件已发送至 %{value}" notice_email_error: "发送邮件时发生错误 (%{value})" @@ -1344,6 +1345,7 @@ zh: label_new_call: 发布需求 label_newtype_contest: 发布竞赛 + label_user_information: "与我相关" label_bid_succeed: "需求发布成功" label_wrong_budget: 错误的金额格式 @@ -1824,6 +1826,7 @@ zh: label_system_platform: 系统平台 label_nextstep: 下一步 label_participate: 参赛者 + label_setting: 配置 label_contest_project: 参赛项目 label_contest_softapplication: 参赛应用 label_contest_response: 用户反馈